Merge branch 'master' into bugfix/10085_indirect_algorithm_CreateMappingFile

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py
	Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Refs #10085
Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into develop

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py
	Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Refs #10085