Merge branch 'master' into 'bug#186'

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang
6 jobs for bug#186 in 0 seconds (queued for 7 minutes)