Modify default doxygen manual
keep current theme if preference page is exited by cancel
Merge branch 'bug-18257-cancel-results-in-default-icons'
Merge branch 'bug-18262-doxygen-causes-generator-tests-to-fail'