Backport of gitlab-org/gitlab-ee!6848
Backport of gitlab-org/gitlab-ee!6848

iiet/iiet-git,jirutka/gitlabhq,mmkassem/gitlabhq,mmkassem/gitlabhq,iiet/iiet-git,jirutka/gitlabhq,stoplightio/gitlabhq,dreampet/gitlab,axilleas/gitlabhq,axilleas/gitlabhq,mmkassem/gitlabhq,dreampet/gitlab,jirutka/gitlabhq,iiet/iiet-git,iiet/iiet-git,axilleas/gitlabhq,stoplightio/gitlabhq,jirutka/gitlabhq,stoplightio/gitlabhq,dreampet/gitlab,stoplightio/gitlabhq,axilleas/gitlabhq,mmkassem/gitlabhq,dreampet/gitlab