Merge "rdbms: cleanup runMasterPostTrxCallbacks() transaction check"