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

# Conflicts:
#   example-data/nfv-nsd.xml
#   example-data/nfv-vnfd.xml
1 job from bug#252 in 0 seconds (queued for 18 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:08