refs #6856 still undoing wrong merge with new API ticket
refs #6856 attempting to solve 3-sided conflict

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop

Conflicts:
	SystemTests/AnalysisTests/Diffraction_Workflow_Test.py