Merge remote-tracking branch 'origin/bugfix/9829_sqw_plot_from_workspace'
Merge remote-tracking branch 'origin/bugfix/9971_sofw_crash_debug_log'
Merge remote branch 'origin/feature/10096_Fix_LoadSassena_SortByQVectors'
Merge remote-tracking branch 'origin/bugfix/9895_SlowUT'
Merge remote-tracking branch 'origin/feature/10086_enginxcalibrate'
Merge remote-tracking branch 'origin/bugfix/2499_more_documentation_on_default_mantid_user_properties'
Merge remote-tracking branch 'origin/bugfix/9339_swap_fit_and_fit_sequential_buttons'
Merge remote-tracking branch 'origin/feature/10106_remove-unused-banks'
Merge remote-tracking branch 'origin/feature/10114_strip_spaces_in_refl'
Merge remote-tracking branch 'origin/feature/10037_crash_on_sum_neighbours'
Remove option to include ADS workspaces in reflectometry list.

Refs #10112.
Merge remote-tracking branch 'origin/feature/10098_remove_search_box'
Merge remote-tracking branch 'origin/feature/10081_clang_compilation_mac'
Resolve merge conflict between #10112 and #10098.

Refs #10112.

Conflicts:
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_options.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_options_window.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_options_window.ui
Merge branch 'feature/10112_scrap_workspace_population' into develop