Merge remote branch 'origin/feature/10132_new_CNCS_geom'
Merge remote branch 'origin/feature/10138_TOPAZ_detectors'
Merge remote branch 'origin/feature/10137_pylint_whitespace'

Conflicts:
	Code/Mantid/scripts/Interface/ui/reflectometer/latest_isis_runs.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_options.pyi

Refs #10137
Merge remote branch 'origin/feature/10137_pylint_whitespace'
Refs #10154. Fixed geometry.
Refs #10154. Fix conflicts that have nothing to do with this ticket.