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