refs #6856 Minor commits, and digging for merge conflict source
refs #6856 Resolving merge conflict

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' of https://github.com/mantidproject/mantid into develop

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp