Fixes #7590 - OS Family web UI is handled uniquely in three different places

OS Family web UI is handled uniquely in three different places