dnsmasq: fix regression from previous commit
dnsmasq: bugfix #2 for new uid logic
dnsmasq: bugfix #3 for new uid logic
dnsmasq: consolidate last fixes with Simon Kelley
dnsmasq: small tidy
Merge remote-tracking branch 'upstream/master'
Update builds with dnsmasq bugfixes