refs #6855 fixing weird merge artifacts in ConvertToMDComponentsTest
refs #6855 weird merge artifacts in ConvertToMD.h