Revert "Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab into luciash-master-patch-01122"

This reverts commit ef65e01b2e39eb8b98caab90d55da6b6b99c2352