More javadoc fixes for JDK8
fix javadoc failures on jdk8