Merge "Fix documentation generation with OpenJDK 9 javadoc."