CE upstream - Wednesday

Closes gitlab-qa#103, gitaly#722, and gitlab-ce#39884

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