Merge remote-tracking branch 'origin/feature/5522_CNCS_systemtest'
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 fixing conflicts

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop

Conflicts:
	SystemTests/AnalysisTests/MDWorkspaceTests.py