Merge branch 'master' into 'bug#97'

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

00:00:04