CE upstream - 2018-02-07 20:29 UTC

Closes #4813, gitaly#880, gitaly#1000, and gitaly#994

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