Change name. Refs #10699
Try to solve merge conflict. Refs #10699
Refs #10699. Merge branch 'feature/10699_renameMDNormSXD' into develop

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt