Merge remote-tracking branch 'origin/feature/8643_quick_pol_corr'
Merge remote-tracking branch 'origin/feature/8669_addsamplelog_int_properties'
refs #8689. Fixes L2QTest.
Merge branch 'feature/8689_fix_system_tests' into develop