Merge pull request #609 from apache/clean-javadoc

Clean javadoc