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

# Conflicts:
#   src/yang/etsi-nfv-nsd.yang
1 job for bug#251
in 0 seconds, using 0 compute credits, and was queued for 20 seconds