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