ARIES-1047 JPA 2.1 support