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
1 job from bug#95 in 0 seconds (queued for 13 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:05