Resolve conflict between 9473 and develop

This reverts commit 14103a1a3d3970a9b01276d3317621e5fcde358e.

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