Backport of reconcile consul-k8s with changes made in Consul into release/1.4.x#3585

hc-github-team-consul-core wants to merge 2 commits intorelease/1.4.xhashicorp/consul-k8s:release/1.4.xfrom

backport/generate_crds/locally-noted-dogfishhashicorp/consul-k8s:backport/generate_crds/locally-noted-dogfishCopy head branch name to clipboard