CE upstream - 2018-07-04 12:21 UTC

Closes gitaly#329, gitaly#320, gitaly#323 et gitaly#328

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