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

# Conflicts:
#   example-data/nfv-nsd.xml
#   example-data/nfv-vnfd.xml