fixes #8131 - hypervisors forced into content host's org, env, and cv

tests and rubocop

updates based on p-r comments
Merge pull request #4779 from thomasmckay/8131-virt-who

fixes #8131 - hypervisors forced into content host's org, env, and cv
fixes #6060 - Fixes activation-key content override, BZ 1104638