Upstream GitLab merge
Target upstream changeset selected automatically, again as the first non-conflicting one that changes GITLAB_SHELL_VERSION
,
giving us something to do manually.
This is the first MR to be validated with the downstream pipelines of #699 (closed)