Merge branch 'dev-v3.5.1' into 'issue#28'

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang
1 job for issue#28
in 0 seconds, using 0 compute credits, and was queued for 13 seconds