Merge "Allow starting dnsmasq without DHCP"