Merge "Disallow mismatched beginMasterChanges/commitMasterChanges"