Merge "Delete more unsed legacy dnsmasq files"