Merge "Replace unecessary rollbackMasterChangesAndLog() call in doPostOutputShutdown()"