Re #9341. Do the doxygen documentation right this time.
Merge branch 'bugfix/9341_doxygen_and_ccpcheck_warnings' into develop