Port of mk-fix-issue-1843 to EE

What does this MR do?

Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11465

Why was this MR needed?

ee compat check asked me to (although I didn't get a conflict locally during the cherry pick).

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated
• API support added
• Tests
  • Added for this feature/bug
  • All builds are passing
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if it does - rebase it please)
• Squashed related commits together