Merge branch 'master' into 'bug#103'

# Conflicts:
#   src/yang/etsi-nfv-common.yang
#   src/yang/etsi-nfv-ns.yang
#   src/yang/etsi-nfv-vnf.yang
1 job for bug#103 in 0 seconds (queued for 24 seconds)