Merge "Removed configuration option for qos agent driver selection" into feature/qos

diff --cc neutron/agent/l2/agent_extension.py
Simple merge

diff --cc neutron/agent/l2/extensions/manager.py
Simple merge

diff --cc neutron/agent/l2/extensions/qos.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/agent/l2/extensions/test_manager.py
Simple merge

diff --cc neutron/tests/unit/agent/l2/extensions/test_qos.py
Simple merge