Refs #9548 Modify MergeRuns to fill history correctly.
Merge remote-tracking branch 'origin/feature/9369_upgrade_history_gui'

Conflicts:
	Code/Mantid/Framework/API/test/DataProcessorAlgorithmTest.h
Merge remote branch 'origin/feature/9654_VATES_doc_crash'
Merge remote-tracking branch 'origin/master' into feature/9548_merge_runs_record_history
Refs #9548 Fix conflicting duplicate method declaration.
Merge branch 'feature/9548_merge_runs_record_history' into develop