Merge remote branch 'origin/feature/8193_cylinder_integration_SCD_reduction'

Re #8193

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.ui
Merge remote-tracking branch 'origin/bugfix/8276_remove_plot_energy_button'
Merge remote-tracking branch 'origin/feature/7505_sinq_code_check'
Refs #8286 Correct ties to refer to correct functions.
Merge branch 'bugfix/8286_ConvFit_delta_func_error' into develop