Merge branch 'feature/5121_furyfit_fix_params' into feature/8284_fury_convfit_data_selector

Refs #8284

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

Refs #8284

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