reconcile consul-k8s with changes made in Consul#3543

NiniOak merged 1 commit intomainhashicorp/consul-k8s:mainfrom

generate_crdshashicorp/consul-k8s:generate_crdsCopy head branch name to clipboard