Merge "doc: Clean up Doxyfile for doxygen 1.8.6"