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

# Conflicts:
#   example-data/nfv-nsd.xml
1 job for issue#14
in 0 seconds, using 0 compute credits, and was queued for 17 seconds