CE Upstream - Monday

Closes gitlab-qa#99, gitaly#681, gitlab-qa#88 et gitlab-ce#31811

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