Integrate gfeeprom/integrate/gitlab-ci/CI-gitlab-ci-merge-after-merge-fixes

--

Commit: https://gitlab.com/SECO-Northern-Europe/tools/gfeeprom/-/commit/35dab34b408e806b2fa7e4d82f694296f1d2f404

Integrate gitlab-ci/CI-gitlab-ci-merge-after-merge-fixes

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/3f293145ca987e3ea3bfb7b1530485167d011a77

CI: merge_gitlab_ci: Fix for merge.