CE upstream - 2018-06-22 12:21 UTC

Closes gitaly#327 and gitlab-ce#47893

See merge request gitlab-org/gitlab-ee!6242