Cleanup javadoc to be jdk8 compatible