Refs #8028 fix system test broken by this ticket
Merge branch 'feature/8028_fix_windows_7_db_build' into develop