Merge branch '22191-delete-dynamic-envs-mr' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dynamic-envs-mr