refs #6856 minor comments
refs #6856 minor warning ans suspicions for merge error
refs #6856 Resolving merge conflicts

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop

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