refs #7548. Fix merge conflicts.
Merge remote-tracking branch 'origin/feature/8066_output_convolved_components'
Merge remote branch 'origin/feature/8168_maskbintable'
Merge remote-tracking branch 'origin/bugfix/8228_fit_history_from_fit_browser'
Merge remote-tracking branch 'origin/bugfix/8225_QLines_resnorm_opt'
Merge remote-tracking branch 'origin/feature/8126_icat4_external_download'

Conflicts:
	Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
refs #8126
Merge remote-tracking branch 'origin/bugfix/8247_bayes_seq_fit_error'
Merge remote-tracking branch 'origin/feature/7829_radius_sum'
Merge remote-tracking branch 'origin/bugfix/8248_monitor_colours_on_transposed_data'
Re #8260. Use EventWorkspace->setAllX when possible.
Merge branch 'bugfix/8260_negative_resamplex' into develop

Re #8260

Conflicts:
	Code/Mantid/Framework/Algorithms/CMakeLists.txt
	Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp