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

# Conflicts:
#   example-data/nfv-nsd.xml
1 job for issue#3 in 0 seconds (queued for 18 seconds)