Merge branch '2.6.1-dev' of https://forge.etsi.org/gitlab/nfv/SOL002-SOL003 into 2.6.1-dev

1 job for 2.6.1-dev
in 0 seconds, using 0 compute credits, and was queued for 10 seconds