Revert "Deletes floating ip related connection states"

This reverts commit 3a30d19e4e2e5bf4f54045561158661b43beecb3.

The change pulled in a new runtime dependency on conntrack-tools
that was not present in previous Icehouse releases. Leaving the
patch applied in the branch means that all distributions are
either forced to ship the new package and its dependencies in
their repositories, or patch out the fix. Also, running
conntrack in network namespaces can be problematic on some of
platforms with old kernels (like RHEL6).

Change-Id: I0cb896d5bef9982cb862a195ec4010f62bded39c
allow delete_port to work when there are multiple floating ips

It is possible to associate multiple floating ip addresses with a single
port through the use of multiple *fixed* ip addresses, e.g.:

    nova boot ... --nic net-id=my-net-id myserver
    nova add-fixed-ip myserver my-net-id
    nova add-floating-ip --fixed-address x.x.x.1 myserver y.y.y.y.1
    nova add-floating-ip --fixed-address x.x.x.2 myserver y.y.y.y.2

In this situation, neutron.db.l3_db.disassociate_floatingips would throw
an exception:

    Exception: Multiple floating IPs found for port <port-id>

This would prevent someone from deleting an instance that was associated
with multiple floating ips.

This patch corrects disassociate_floatingips so that it will
disassociate all floating ips associated with the port, allowing the
delete operation to proceed correctly.

Conflicts:
	neutron/db/l3_db.py

Change-Id: I68a2131fa8ee80828354c9db4ac405c3f77c3b90
Closes-bug: 1302701
(cherry picked from commit bad87ce76ad27f2a4b3c72e26e2eccc2c9564b85)
Merge "Revert "Deletes floating ip related connection states"" into stable/icehouse
Merge "allow delete_port to work when there are multiple floating ips" into stable/icehouse