Revert "Work around neutron floatingip race condition"

This reverts commit 38ac22ce7c4ea4ee9a86e1b6f2c3e5e31c8ba652.

Neutron claim the symptoms are fixed but there may be more issues
under the hood - we should see if thats the case.

Change-Id: I7e4c9448d9fc8ae10522d33495e9f6d2de64c129
Heat patchset has hit trunk.

We no longer need a custom heat to get rebuild --replace-ephemeral
support.

Change-Id: I801bd1bfcf83967bb8d328f6e1432f76ff17da84
Merge "Revert "Work around neutron floatingip race condition""
Merge "Heat patchset has hit trunk."