CE upstream - Friday

Closes gitlab-ce#31644, gitlab-ce#32985, gitaly#246, gitaly#242, #2433, #2472, gitlab-qa#45, gitlab-qa#48, and gitlab-ce#31701

See merge request !2018