Merge "Ensure resolv.conf is a straight symlink" into release/2019.2.0