Integrate gitlab-ci/CI-fix-merges-after-gitlab-ci and 2 more
CI: merge_into_manifest: Fix already merged detection
--
CI: Merge_into_manifest: Fixes for merge detection
--
CI: Merge_into_manifest: Fixes for merge detection
CI: merge_into_manifest: Fix already merged detection
--
CI: Merge_into_manifest: Fixes for merge detection
--
CI: Merge_into_manifest: Fixes for merge detection