Merge branch '2.5.1-dev' of https://forge.etsi.org/rep/nfv/SOL005 into 3.5.1-dev

1 job for 3.5.1-dev
in 0 seconds, using 0 compute credits, and was queued for 8 seconds