Refs #9369 Fix for OSX/RHEL6 extra qualification error.
Refs #9369 Fix doxygen warnings.
Merge branch 'feature/9369_upgrade_history_gui' into develop