Merge "Fix plugin tree for CoreDNS"