add a log to get the original exception when one occurs during the rollback phase
add required classes for Atomikos integration
Merge branch 'master' into 'DataManagement'