Documentation build fixes

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

Merge request reports