Refs #8587 Fixing issues with system tests.
Merge branch 'feature/8587_DOS_port' into develop