JIPI-31 Hibernate 5.x integration