Merge branch 'security-390910-15-10' into '15-10-stable-ee'

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

Changelog: security