Fixed JAXB issues moving to Java 8.