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

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