Merge "Option to remove routers from dead l3 agents"

diff --cc etc/neutron.conf
Simple merge

diff --cc neutron/db/l3_agentschedulers_db.py
Simple merge

diff --cc neutron/services/l3_router/l3_router_plugin.py
Simple merge