Added support to persistence 2.1 in JPAHandler