Sync gitlab-git-v2.40 with security

We didn't synchronize our gitlab-git branches once the latest security fixes had been released, which is getting rectified by this merge request.