CE upstream - 2018-06-27 18:21 UTC

Closes gitaly#1237 and gitaly#1218

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