Merge branch 'security-360540-zentao-xss-links-14-10' into '14-10-stable-ee'

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

Changelog: security