Merge branch 'fix/ofc22-tests' of gitlab.com:teraflow-h2020/controller into fix/ofc22-tests