Merge remote-tracking branch 'remotes/origin/feature/6614_api_migrate'
refs #6856 Temporary modifying the system tests to run prev algorithm
refs #6856 One more place to change the alg version
refs #6856 reverting change to API2 erroneously merged with this ticket
refs #6856 still reverting API2
refs #6856 Trying to identify the error in Diffraction_Workflow_Test
refs #6856 still undoing wrong merge with new API ticket
refs #6856 Temporary reverting to V1 of algorithm
refs #6856 fixing ConvertToDiffractionMDWorkspace interface
refs #6856 fixing merging conflicts with changes to API-2

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop

Conflicts:
	SystemTests/AnalysisTests/Diffraction_Workflow_Test.py
	SystemTests/AnalysisTests/MDWorkspaceTests.py
	SystemTests/AnalysisTests/WishDiffuseScattering.py
refs #6856 small merging error fixed
refs #6856 Merge conflicts

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop

Conflicts:
	SystemTests/AnalysisTests/Diffraction_Workflow_Test.py