Merge branch 'master' into 'bug#97'

# Conflicts:
#   src/yang/etsi-nfv-ns.yang
1 job for bug#97 in 0 seconds (queued for 11 seconds)