dnsmasq: backport fixes