Don't link to external javadoc. Fixes a few javadoc errors as well.
Merge pull request #2604 from nawroth/javadoc-cleanup

Don't link to external javadoc. Fixes a few javadoc errors as well.