Merge branch 'bugfix/9048_smallWinBugs' into develop
Merge branch 'bugfix/9048_smallWinBugs' into develop
Merge branch 'bugfix/9048_smallWinBugs' into develop
Merge branch 'feature/9026_composite_catalog' into develop
Merge branch 'bugfix/9048_smallWinBugs' into develop
Merge branch 'bugfix/9048_smallWinBugs' into develop
Merge branch 'feature/8900_improve_icat_algorithms' into develop
Merge branch 'bugfix/9048_smallWinBugs' into develop
Merge branch 'feature/9059_logger_refactor' into develop
Merge branch 'bugfix/9048_smallWinBugs' into develop
refs #9048 nasty conflict with develop

Merge branch 'bugfix/9048_smallWinBugs' into develop

Conflicts:
	Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitsConversionHelper.h
	Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp
	Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp
refs #9048 still lefower from merge conflict with develop.

Conflicts:

	Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitsConversionHelper.h
	Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp
Merge branch 'feature/9049_remote_job_includes' into develop
Merge branch 'feature/8601_getdetoffsets_more_stat' into develop
Merge branch 'bugfix/8953_populate_geometry_tab_correctly' into develop
Merge branch 'feature/5300_moments_sqw_tab' into develop