Fixes to build javadoc with maven 3.2.1 and jdk8.