Add RC2 changes to 9-3-stable-ee
Summary
Adds the changes from https://gitlab.com/gitlab-org/gitlab-ee/commit/86051969bd10f2c75540add61424aa12bb21e265 to 9-3-stable-ee
Related Issues
Closes #2627 (closed)
Related CE issue https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12073
Edited by Kushal Pandya