Merge remote-tracking branch 'origin/bugfix/7406_fix_filedescriptor_test'
Refs #7408. Fixing the shutdown warning.
Merge branch 'bugfix/7408_splatterplot_shutdown_warning' into develop