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