Deal with doxygen warnings of my own making. Refs #7350
Merge remote branch 'origin/bugfix/7350_doxygen_errors'