Merge branch '4.4.1-maintenance' of https://forge.etsi.org/rep/nfv/SOL002-SOL003 into 4.4.1-maintenance