Merge "Bug 4957 TxChainManager lifecycle startup cleaning"