Backport !15678 to `10-2-stable`

Backport of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15678 to the 10-2-stable branch. /cc @stanhu

@winh @mkozono This targets the 10-2-stable branch for now as there's currently no patch preparation branch/MR, let me know if I should change it. Also, I set the ~"Pick into 10.2" label so that this MR is visible in the list of fixes, even though you won't need to actually pick it.