Merge branch 'master' into 'bug#93'

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang
1 job from bug#93 in 0 seconds (queued for 12 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:04