Merge branch 'master' into 'bug#89'

# Conflicts:
#   example-data/nfv.xml
#   src/yang/etsi-nfv-common.yang
#   src/yang/etsi-nfv-ns.yang
#   src/yang/etsi-nfv-vnf.yang
1 job for bug#89 in 0 seconds (queued for 14 seconds)
Status Job ID Name Coverage
  External
failed jenkins

00:00:05