Merge "Distributed router can not add routes"

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

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

diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge