Merge "[deploy] Explicitly set NS for resolvconf in VMs"