Merge branch 'security-security/sh-deploy-token-ip-fix-14-10' into '14-10-stable-ee'

See merge request gitlab-org/security/gitlab!2471

Changelog: security