Integrate gitlab-ci/CI-gitlab-ci-merge-after-merge-fixes
requested to merge integrate/gitlab-ci/CI-gitlab-ci-merge-after-merge-fixes into guf_imx_v2020.04-trizeps8plus_2021_12_07
CI: merge_gitlab_ci: Fix for merge.
CI: merge_gitlab_ci: Fix for merge.