Merge "Use _ from neutron._i18n"

diff --cc neutron/agent/common/ovs_lib.py
Simple merge

diff --cc neutron/common/config.py
Simple merge

diff --cc neutron/db/l3_agentschedulers_db.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