Merge branch 'dev-v2.8.1' into 'issue#1'

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

00:00:09