Merge remote-tracking branch 'origin/feature/qos' into merge-branch

Change-Id: I683102e617202e0ffc953a0d3cc179879f8faf82
tree: 30400ca41fa8d850c9a30678593876c1d280a893
  1. neutron/