Fixed the javadoc errors that fail the build
Merge remote-tracking branch 'origin/jdocs-quickfix'