Merge branch 'master' into 'bug#186'

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang
6 jobs from bug#186 in 0 seconds (queued for 7 minutes)
Status Job ID Name Coverage
  Build
failed #1278
build

failed #1227
build

 
  Test
skipped #1229
allowed to fail
code_quality
skipped #1228
test
 
  External
passed jenkins

00:00:07

failed jenkins

 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace