Merge branch 'security-654-14-10' into '14-10-stable-ee'

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

Changelog: security