Refs #5217: Fix content host menu item and add organization scoping.
Merge pull request #4092 from ehelms/refs-5217

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