refs #6856 doxygen errors
refs #6856 more comments
Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' of https://github.com/mantidproject/mantid into develop