Merge branch 'develop' of ssh://labs.etsi.org:29419/tfs/controller into...

Merge branch 'develop' of ssh://labs.etsi.org:29419/tfs/controller into feat/304-cttc-netconf-based-openconfig-telemetry-collector