HHH-8137 - Javadoc generation is currently not playing nicely with Java7 javadoc changes