MODE-2093 Corrected Java and JavaDoc warnings and errors.
Merge pull request #1158 from rhauch/mode-2093-fixes

MODE-2093 Corrected Java and JavaDoc warnings and errors.