Merge remote branch 'origin/feature/7228_ConverToMDPerformance'
Change mask file that is actually used by the systemtests.

refs #8009
Merge branch 'feature/8009_basis_diffraction_idf' into develop