Merge branch 'cnit_related_activity_premerge' of...

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