Work on atomikos config
Merge remote-tracking branch 'origin/jta-comparison' into jtas

Conflicts:
	magma-benchmark-atomikos/src/main/resources/atomikos-context.xml