Merge "DNS test server for ingress controller"