xjc fixes for Java 8.