HHH-8444 - Fix criteriaapi failures from JPA 2.1 TCK