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

Change-Id: I7f2342d62634f5b4af3a083cc1aaff46efe28519
tree: 7dca120fce2f48d1313f0f729acb5b60ab623ab8
  1. neutron/