Merge branch 'feat/370-cttc-fix-ofc25-test' of...

Merge branch 'feat/370-cttc-fix-ofc25-test' of ssh://labs.etsi.org:29419/tfs/controller into feat/370-cttc-fix-ofc25-test