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