Pick 10.2.4 security fixes into master

See merge request gitlab-org/gitlab-ce!15821