Merge remote-tracking branch 'origin/feature/10408_autocomplete_tweaks'
Merge branch 'master' into feature/10431_refl_presenter_use_model

Refs #10431

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h
Merge branch 'feature/10431_refl_presenter_use_model' into develop