Merge branch 'security-fix-escape-filters' into 'master'

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

Changelog: security