Merge "Switch to oslo.service"

diff --cc neutron/agent/dhcp/agent.py
Simple merge

diff --cc neutron/agent/l3/agent.py
Simple merge

diff --cc neutron/agent/metadata/agent.py
Simple merge

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

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge