Merge remote-tracking branch 'origin/feature/10324_spectrum_view_keys_move_by_one_spectrum'
Merge remote-tracking branch 'origin/feature/10237_refl_ui_options_menu'
Merge branch 'master' into feature/10431_refl_presenter_use_model

Refs #10431

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
	Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
	Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h
Merge branch 'feature/10431_refl_presenter_use_model' into develop