Merge branch 'dev-v3.5.1' into 'issue#28'
# Conflicts: # src/yang/etsi-nfv-vnf.yang
WARNING! Gitlab maintenance operation scheduled for Saturday 28th March from 8 a.m. (CET) to approximately 3 p.m. (CET). GitLab will be unavailable during this time.
# Conflicts: # src/yang/etsi-nfv-vnf.yang