Backport no approval required
This backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9899 to 11.8.
The only changes in here are a spec and a changelog, so they're only really needed for consistency and avoiding future conflicts.
Edited by Bob Van Landuyt