Refs #8651 fix doxygen comments
Refs #8651 resolve merge conflict