Merge branch 'v2.7.1' into 'bug#252'
# Conflicts: # example-data/nfv-nsd.xml # example-data/nfv-vnfd.xml
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April 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 # example-data/nfv-vnfd.xml