Merge branch 'master' into 'bug#170'

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