Merge "Ensure resolv.conf is a straight symlink"