Fix some javadoc errors
Merge pull request #3405 from wm3/fix-javadoc-errors

Fix some javadoc errors