Merge branch 'master' into feature/8632_doxygen_errors
Refs #8632. Fixing last MantidPlot error.
Refs #8632. Fixing most of the MantidQt errors.
Merge branch 'feature/8632_doxygen_errors' into develop