Remove doxygen warnings

re #7450
Merge remote branch 'origin/feature/7450_doxy_warns'