Merge "Move consul config from shared NFS to configmap"