refs #6856 Enabling last disabled unit test
Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' of https://github.com/mantidproject/mantid into develop
Merge branch 'develop' of https://github.com/mantidproject/mantid into develop