Integrate touchcal-conv/integrate/gitlab-ci/CI-gitlab-ci-merge-after-merge-fixes

--

Commit: https://gitlab.com/SECO-Northern-Europe/tools/touchcal-conv/-/commit/1786dfa0da8cdc33c9c45c3d4ae51d8b45ec72ea

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

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/2aeb899ae3a3ad32ccac3b15f7025d42de5d5dac

CI: merge_gitlab_ci: Fix some post merge issues

SRCREV.conf

@@ -3,7 +3,7 @@ SRCREV_pn-gfeeprom = "2e7e4b8ecef6d229bebc5bc86615fcadf98f7e1d"
 SRCREV_pn-guf-show-demo = "a74f4dac71da2cefcaae171733c3edfaa96ecbbe"
 SRCREV_pn-libmdb = "ae4c8adc5052b092cb4923dd68773ec540b6a551"
 SRCREV_pn-ltp-guf-tests = "0c8688d386c42475fe4059ccf187941fad13ac03"
-SRCREV_pn-touchcal-conv = "db84bd30f031d1901d4ece0a5d13624208334ac9"
+SRCREV_pn-touchcal-conv = "1786dfa0da8cdc33c9c45c3d4ae51d8b45ec72ea"
 SRCREV_pn-gfxml2dto = "5694317cc49ceb14a9a96aeb3bec2a49528b4631"
 SRCREV_pn-egalaxi2c = "623ed9ef40069e87e02c98cffb55a9d9aaa0aedd"
 SRCREV_pn-gfplatdetect = "2ec24f72faee889e7ac8f163b7b3c1dc3fced9d3"