Merge remote-tracking branch 'origin/bugfix/10141_rename_indirect_interfaces'
Merge remote-tracking branch 'origin/feature/10007_make_resolution_calculation_more_robust'
refs #10007. Not quite wired up correctly.
Merge remote-tracking branch 'origin/feature/10139_show_inst_params_on_inst_view'
Merge remote-tracking branch 'origin/bugfix/8629_remove_warning_when_loadcalfile_cannot_find_monitors'
re #9686 Adjust to hadle lazy loading & perform stress test
Merge remote-tracking branch 'origin/master' into feature/9868_Workspace_FilterBox
Merge branch 'feature/9868_Workspace_FilterBox' into develop

re #9868

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py