Merge remote-tracking branch 'origin/feature/8742_icat_publish_input_description'
Merge remote-tracking branch 'origin/feature/7891_statistics_export_python'
Merge remote-tracking branch 'origin/bugfix/8578_storedPythonParams'
Merge remote-tracking branch 'origin/master' into feature/8640_restore_loaddetectorinfo_removal

Conflicts:
	Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
	Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp

Refs #8640
Merge branch 'feature/8640_restore_loaddetectorinfo_removal' into develop

Conflicts:
	Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp

Refs #8640