Merge remote-tracking branch 'origin/feature/9051_muon_use_same_window'
Merge remote-tracking branch 'origin/feature/8557_SNSvsISIS'
Merge remote-tracking branch 'origin/feature/9056_mantid_table_replace_all_y_columns'
Refs #8849. Merge remote-tracking branch 'origin/master' into 8849

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MuonAnalysisOptionTab.h
	Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysisOptionTab.cpp
Merge branch 'feature/8849_muon_analysis_validators' into develop