Merge "Fix deleting/publishing of draft patch sets for non draft changes"