Merge branch 'sync-security-with-canonical' into 'master'

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

Changelog: security