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, using 0 compute credits, and was queued for 14 seconds