Merge branch 'cherry-pick-98bf5baa-2' into '17-2-stable-ee'

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

Changelog: security