Merge branch 'dev-v2.8.1' into 'issue#3'
# Conflicts: # example-data/nfv-nsd.xml
WARNING! Gitlab maintenance operation scheduled for Thursday, 7 May between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
# Conflicts: # example-data/nfv-nsd.xml