Ports gitlab-ce!24828 to EE

Denys Mishunovrequested to merge
ee-55221-username-wrapping into master

What does this MR do?

Ports https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24828 to EE

Edited by Paul Slaughter

Merge request reports