Fixes done for [https://issues.jboss.org/browse/WFLY-10964|WFLY-10964] (https://github.com/wildfly/wildfly/commit/9dac9810796469ab45cb2b6e0fde926b9d193561) are also applicable to the statistics in hibernate-jipijapa.

Also not sure why this code lives in two places (https://github.com/hibernate/hibernate-orm/tree/master/hibernate-jipijapa and https://github.com/wildfly/wildfly/tree/master/jpa/hibernate5).