Merge remote-tracking branch 'origin/bugfix/6923_auto_update'
Merge remote branch 'origin/bugfix/7150_split_workspace'

Conflicts:
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py

Re #7150.
Merge remote-tracking branch 'origin/feature/7155_migrate_PearlMCAbsorption'
Merge branch 'feature/7156_migrate_OSIRISDiffractionReduction'
Merge remote branch 'origin/feature/7174_sequoia_adara_config'
Merge branch 'master' of https://github.com/mantidproject/mantid
refs #6856 Copied ConvertToDiffractionMDWorkspace.cpp

into MD algorithms
refs #6856 Cloned initial algorithm into version 2

and verified that everything (unit tests) works fine, so we have two identical versions of the same algorithm with only the version number different
refs #6856 Compiles but does not work
refs #6856 All works except single event per bin
refs #6856 Disable missing properties on interface and some comments
refs #6856 minor comments
refs #6856 minor warning ans suspicions for merge error
refs #6856 Minor commits, and digging for merge conflict source
refs #6856 Enabling last disabled unit test
refs #6856 doxygen errors
refs #6856 more comments
refs #6856 Merge conflicts

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py