Merge "Add hypervisor_type option"