CE Upstream - Wednesday

Closes #2563, #2411, gitlab-ce#19219, #2361, and gitlab-ce#31397

See merge request !2060