Merge "Made rollbackMasterChanges catch exceptions, throwing the last one"