Merge branch 'cache-leak-fix' of github.com:rankinc/btm into rankinc-cache-leak-fix
Merge branch 'rankinc-cache-leak-fix'
Merge branch 'master' into cauldron

Conflicts:
	btm/src/main/java/bitronix/tm/resource/jdbc/proxy/ConnectionJavaProxy.java