xa transaction recovery and some bug fixes related to txn/locking
for compile naming issue
small fix
Merge pull request #1794 from gurbuzali/xa-transaction-recovery/3.x-master

xa transaction recovery and some bug fixes related to txn/locking