Backport some changes from EE
What does this MR do?
This backport changes that are in EE.
Why was this MR needed?
I discovered a few discrepancies while doing https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2906 and reviewing other MRs.
This backport changes that are in EE.
I discovered a few discrepancies while doing https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2906 and reviewing other MRs.