Merge branch 'security-674-fix-jira-content-injection-14-10' into '14-10-stable-ee'

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

Changelog: security