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/68-cttc-add-sbi-driver-for-flex-scale-optical-sdn-controller