Merge branch 'master' into bugfix/10125_add_save_button_to_workspace_list

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp

Refs #10125
Merge branch 'bugfix/10125_add_save_button_to_workspace_list' into develop