Merge branch 'master' into 'bug#227'

# Conflicts:
#   run-test.sh
#   src/yang/etsi-nfv-ns.yang
#   src/yang/etsi-nfv-vnf.yang
1 job for bug#227 in 0 seconds (queued for 20 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:07