Fix JavaDoc strings that were causing the documentation build to fail

Merged Morten Ofstad requested to merge feature/morten.ofstad/FixJavaDoc into master

Merge request reports