Merge branch 'master' into bugfix/9968_refactor_indirect_tabs

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReductionTab.h
	Code/Mantid/MantidQt/CustomInterfaces/src/C2ETab.cpp

Refs #9968
Merge branch 'bugfix/9968_refactor_indirect_tabs' into develop