Merge "Replacing deprecated list_hosts with list_hypervisors"