refs #6856 Trying to identify the error in Diffraction_Workflow_Test
Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop