pick from master #34548 The modification involving CloudGlobalTransactionMgr was not picked up to 2.1 because the 2.1 branch does not yet have the Thunderbolt CloudGlobalTransactionMgr