Fix failing system test

Refs #10409
Merge branch 'feature/10409_elwin_ui_use_elasticwindow' into develop