Fix issue with javax.transaction. Require 1.1 now
Merge branch 'master' into fixexpression
Merge branch 'fixexpression' into test