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

Change-Id: I1c1fd593235fda1cdd053980f50eff21ca9011b6
tree: ea5b717a60f63841fec7c29fe16e9328a82fa709
  1. neutron/