Fixes for doxygen errors coming from 3810596.

commit 8ef1846c05d32a92b23538ee491fd31350c2a045 mainline

Doxygen errors that are regression from 3810596. Went in because
I forgot to install doxygen into my test environment.