CE upstream - 2018-08-17 09:22 UTC

Closes gitaly#1243, gitaly#1310, and gitaly#1246

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