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

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang
1 job from issue#34 in 0 seconds (queued for 53 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:12