Merge "Delete disassociated floating ips on external network deletion"

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

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

diff --cc neutron/plugins/bigswitch/plugin.py
Simple merge

diff --cc neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
Simple merge

diff --cc neutron/plugins/midonet/plugin.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/plugins/nuage/plugin.py
Simple merge

diff --cc neutron/plugins/oneconvergence/plugin.py
Simple merge

diff --cc neutron/plugins/vmware/plugins/base.py
Simple merge

diff --cc neutron/tests/unit/metaplugin/fake_plugin.py
Simple merge

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