Integrate gitlab-ci/CI-fix-merges-after-gitlab-ci and 2 more

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/7381d5983371f0bedd89d6c40db6c600932909e6

CI: merge_into_manifest: Fix already merged detection

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/5bb84a04cd6de815350f7dbcf59dd04c2b94a6f7

CI: Merge_into_manifest: Fixes for merge detection

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/285ce1951cc2ce2f6a0c390a6ece5042d930e95a

CI: Merge_into_manifest: Fixes for merge detection

.gitlab-ci @ 7381d598

-Subproject commit ce59c40987d7a247d6e0eae713fc806237ace207
+Subproject commit 7381d5983371f0bedd89d6c40db6c600932909e6

.gitlab-ci.yml

@@ -4,7 +4,7 @@
 # ---------------------------------------------------------------------------------------
 include:
   - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
-    ref: ce59c40987d7a247d6e0eae713fc806237ace207
+    ref: 7381d5983371f0bedd89d6c40db6c600932909e6
     file: 'manifest-integration.yml'
 
 variables: