Merge branch 'update-security-with-canonical-changes' into 'master'

Brings canonical changes into security master

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/2942



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Kevin Morrison <kmorrison@gitlab.com>
Co-authored-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Olena Horal-Koretska <ohoralkoretska@gitlab.com>
Co-authored-by: Jiaan Louw <3468028-jiaan@users.noreply.gitlab.com>
Co-authored-by: Clayton Cornell <ccornell@gitlab.com>
Co-authored-by: Thiago Figueiró <tfigueiro@gitlab.com>
Co-authored-by: Steve Abrams <sabrams@gitlab.com>
Co-authored-by: Kerri Miller <kerrizor@kerrizor.com>
Co-authored-by: Kushal Pandya <kushalspandya@gmail.com>
Co-authored-by: Etienne Baqué <ebaque@gitlab.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Natalia Tepluhina <ntepluhina@gitlab.com>
Co-authored-by: Suzanne Selhorn <sselhorn@gitlab.com>
Co-authored-by: Marius Bobin <mbobin@gitlab.com>
Co-authored-by: ddieulivol <ddieulivol@gitlab.com>
Co-authored-by: Dmitry Gruzd <dgruzd@gitlab.com>
Co-authored-by: Amy Qualls <aqualls@gitlab.com>
Co-authored-by: Imre Farkas <ifarkas@gitlab.com>
Co-authored-by: Matthias Käppler <mkaeppler@gitlab.com>
Co-authored-by: Roy Zwambag <rzwambag@gitlab.com>
Co-authored-by: Grzegorz Bizon <grzegorz@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Max Woolf <mwoolf@gitlab.com>
Co-authored-by: Diogo Frazão <dfrazao@gitlab.com>
Co-authored-by: Jan Provaznik <jprovaznik@gitlab.com>
Co-authored-by: Mike Greiling <mike@pixelcog.com>
Co-authored-by: Miguel Rincon <mrincon@gitlab.com>
Co-authored-by: Fabio Pitino <fpitino@gitlab.com>
Co-authored-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Co-authored-by: Marc Shaw <mshaw@gitlab.com>
Co-authored-by: Nao Hashizume <nhashizume@gitlab.com>
Co-authored-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Co-authored-by: Adie Po <avpfestin@gitlab.com>
Co-authored-by: Sanad Liaquat <sliaquat@gitlab.com>
Co-authored-by: Michał Zając <mzajac@gitlab.com>
Co-authored-by: Zhiyuan Lu <1551755561@qq.com>
Co-authored-by: Tetiana Chupryna <tchupryna@gitlab.com>
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
Co-authored-by: Vitaly Slobodin <vslobodin@gitlab.com>
Co-authored-by: Vitali Tatarintev <vtatarintev@gitlab.com>
Co-authored-by: Alina Mihaila <amihaila@gitlab.com>
Co-authored-by: Savas Vedova <svedova@gitlab.com>
Co-authored-by: ghinfey <ghinfey@gitlab.com>
Co-authored-by: Coung Ngo <cngo@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: Furkan Ayhan <furkanayhn@gmail.com>
Co-authored-by: Phil Hughes <me@iamphill.com>
Co-authored-by: Mikolaj Wawrzyniak <mwawrzyniak@gitlab.com>
Co-authored-by: Dzmitry Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Co-authored-by: Patrick Bajao <ebajao@gitlab.com>
Co-authored-by: maddievn <mvanniekerk@gitlab.com>
Co-authored-by: Robert May <rmay@gitlab.com>
Co-authored-by: jennli <jli@gitlab.com>
Co-authored-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Co-authored-by: Jonas Wälter <waelter@outlook.de>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>
Co-authored-by: Wei-Meng Lee <wlee@gitlab.com>
Co-authored-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Rajendra Kadam <rkadam@gitlab.com>