Merge "Preserve floating ips when initializing l3 gateway interface"

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

diff --cc neutron/agent/linux/interface.py
Simple merge

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

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