Merge remote-tracking branch 'origin/feature/10409_elwin_ui_use_elasticwindow'
Refs #10618. Fixing cppcheck warning.
Merge branch 'bugfix/10618_cppcheck' into develop