Merge "Fix configmap for coredns"