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