Merge "Make cloud-init deal with resolv.conf"