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