Refs #8585 Output height parameter from ConvFit.
Refs #8585 Update ConvFit to output Height parameter.
Refs #8585 Update C2Fw to support height.
Refs #8585 Update QLines to output height parameter.
Merge branch 'master' of github.com:mantidproject/mantid into feature/8585_EISF_output_from_fitting
Merge remote-tracking branch 'origin' into feature/8585_EISF_output_from_fitting
Refs #8585 Fix y axis names and x data.
Refs #8585 Add more intelligent spectrum selection process to JumpFit
Refs #8585 Remove debugging statement
Refs #8585 Fix output of QLines for sequential fit.
Refs #8585 Update miniplot with correct spectrum.
Refs #8585 Better formatting on combobox
Merge branch 'feature/8585_EISF_output_from_fitting' into develop

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

Refs #8585