Merge branch 'cnit_related_activity' into 'develop'

Resolve: "(CNIT) Multi-Granular Optical Nodes and Optical Transpoders management"

See merge request !284