refs #6855 fixing weird merge artifacts in ConvertToMDComponentsTest
refs #6855 weird merge artifacts in ConvertToMD.h
Merge branch 'feature/6855_ExplicitQFrame' of https://github.com/mantidproject/mantid into develop
Merge branch 'develop' of https://github.com/mantidproject/mantid into develop