refs #8689. Fixes L2QTest.
Merge remote branch 'origin/feature/8689_fix_system_tests'