Merge branch 'master' into 'bug#93'

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