HHH-9113 - Support for building with Java 8 JDK