Backport of Vault CA bugfixes into release/1.15.x#19307

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

backport/kisunji/vault-ca-fixes/awfully-smooth-katydidhashicorp/consul:backport/kisunji/vault-ca-fixes/awfully-smooth-katydidCopy head branch name to clipboard