Merge "Add a test for a dnsmasq bug."