Merge "Fix JDK8 javadoc compatibility"