Merge branch 'master' into 'bug#95'
# Conflicts: # src/yang/etsi-nfv-common.yang # src/yang/etsi-nfv-ns.yang # src/yang/etsi-nfv-vnf.yang
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
# Conflicts: # src/yang/etsi-nfv-common.yang # src/yang/etsi-nfv-ns.yang # src/yang/etsi-nfv-vnf.yang