refs #7108. Fix system tests.
Merge branch 'master' into feature/7108_conjoin_files
Merge branch 'feature/7108_conjoin_files' into develop