Merge "Replace list_hypervisors with list_services"