Refs #5217: Fix content host menu item and add organization scoping.