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

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/62-tid-add-support-to-nbi-to-export-the-device-inventory-items-2