CE upstream: Thursday

Closes gitlab-ce#32738, gitlab-ce#32647, #2440, gitlab-ce#32551, #2241, gitlab-ce#32449, gitlab-ce#32424, gitlab-ce#30814, and gitlab-ce#17489

See merge request !1981