Merge remote-tracking branch 'origin/master' into feature/8281_sqw_interface_tidy

Refs #8281

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
Merge branch 'feature/8281_sqw_interface_tidy' into develop