Merge branch 'security-fix-commands-changes' into 'master'

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

Changelog: security