Merge "Always log exceptions in rollbackMasterChangesAndLog()"