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

tests and rubocop

updates based on p-r comments