docs: FIx merge conflict#17404

boruszak merged 4 commits intorelease/1.14.xhashicorp/consul:release/1.14.xfrom

backport/docs/annotations-page-structure-fixes/shortly-accurate-boahashicorp/consul:backport/docs/annotations-page-structure-fixes/shortly-accurate-boaCopy head branch name to clipboard