Merge "Support IPv6 Router"

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

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

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

diff --cc neutron/tests/functional/agent/test_l3_agent.py
Simple merge

diff --cc neutron/tests/unit/test_l3_agent.py
Simple merge

diff --cc neutron/tests/unit/test_l3_plugin.py
Simple merge