Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545
What does this MR do?
Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545/commits so it can be cleanly applied.
Edited by 🤖 GitLab Bot 🤖
Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545/commits so it can be cleanly applied.