Merge branch 'master' into 'bug#92'

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

00:00:06