Revert "Revert "Refs #9536 Update C2E system tests to check multi file reduction.""

This reverts commit 158bf2add7d8dcf0a1329524f8ce3869b6edc6a6.
Merge branch 'bugfix/9536_c2e_masking_bug' into develop