Backport consul directory fix to 16.1.x, 16.2.x, and 16.3.x
Backport !7039 (merged) to 16-0-stable, 16-1-stable, and 16-2-stable
As part of https://gitlab.com/groups/gitlab-org/distribution/-/epics/54
Backport !7039 (merged) to 16-0-stable, 16-1-stable, and 16-2-stable
As part of https://gitlab.com/groups/gitlab-org/distribution/-/epics/54