Merge remote-tracking branch 'origin/bugfix/9386_cppcheck_warnings'
Merge branch 'master', remote-tracking branch 'origin' into feature/5121_furyfit_fix_params
Merge branch 'feature/5121_furyfit_fix_params' of github.com:mantidproject/mantid into feature/5121_furyfit_fix_params

Refs #5121

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectCommon.py
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Merge branch 'feature/5121_furyfit_fix_params' into develop

Refs #5121

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectCommon.py