996360-esx - fixes for virt-who hypervisor w/ esx

996360-esx - fix permission for remove deletion

996360-esx - spec test
Merge pull request #2764 from thomasmckay/996360-esx

996360-esx - fixes for virt-who hypervisor w/ esx