Fix some javadoc errors that were preventing the build from compiling when using JDK 1.8.
Merge pull request #2585 from wsargent/fix-scaladoc-halting-18-build

Fix javadoc errors