Fix several @link javadoc warnings
Merge pull request #869 from MarkEWaite/javadoc-fixes-7

Fix several @link javadoc warnings