Merge remote-tracking branch 'origin/bugfix/7344_createworkspace_wiki_example'
Deal with doxygen warnings of my own making. Refs #7350
Merge branch 'bugfix/7350_doxygen_errors' into develop