Merge branch 'cnit_tapi' of https://labs.etsi.org/rep/tfs/controller into cnit_tapi