Add back multiple facility support. Refs #9208.
Merge branch 'feature/9208_icat_gui_hang_fix' into develop