Merge branch 'gy-3.0.2-backport' into 'support/3.0.x'

3.0.2 Backport fixes

See merge request https://gitlab.com/gitlab-org/gitlab-environment-toolkit/-/merge_requests/1156



Merged-by: Grant Young <gyoung@gitlab.com>
Approved-by: Nailia Iskhakova <niskhakova@gitlab.com>
Co-authored-by: Jim Baumgardner <jbaumgardner@gitlab.com>
Co-authored-by: Gregory E. McDaniel <gregory.mcdaniel@infor.com>
Co-authored-by: Nailia Iskhakova <niskhakova@gitlab.com>