Merge "Make floatingip reachable from the same network"

diff --cc etc/l3_agent.ini
Simple merge

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

diff --cc neutron/agent/l3/router_info.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