Merge "Adding so-etsi-nfvo and sol003 adapter jobs"