Backports the changes from gitlab-ee!6572

What does this MR do?

Backports the changes from ee MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6572

This MR should be merged before the other one

Are there points in the code the reviewer needs to double check?

The changes need to be the same as the other MR. Otherwise, any other issues should be raised in that MR so all the discussions are in the same place.

Why was this MR needed?

Because an update to EE touched on a few CE files.

Screenshots (if relevant)

See other, related MR

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated
• API support added
• Tests added for this feature/bug
• Conforms to the code review guidelines
  • Has been reviewed by a UX Designer
  • Has been reviewed by a Frontend maintainer
  • Has been reviewed by a Backend maintainer
  • Has been reviewed by a Database specialist
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• If you have multiple commits, please combine them into a few logically organized commits by squashing them
• Internationalization required/considered
• End-to-end tests pass (package-and-qa manual pipeline job)

What are the relevant issue numbers?