HIbernate JPA now should work fine with JTA
Merge remote-tracking branch 'origin/master'