Resolve merge conflicts with dev.gitlab.org/master after security release

What are the relevant issue numbers?

• https://gitlab.com/gitlab-org/gitlab-ce/issues/40880
• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15821