Merge branch 'v2.7.1' into 'bug#244'

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

00:00:03