I see the same issue with this patch applied.  Looks like /usr/lib/python2.6/site-packages/heat/engine/resources/eip.py may need a patch too.

2014-05-20 11:30:02.450 15470 INFO heat.engine.service [req-62a3a999-2c52-478b-af81-79f4cbc1dcf5 None] Deleting stack Keyserver
2014-05-20 11:30:02.537 15470 INFO heat.engine.resource [-] deleting NestedStack "Instance" [0460402e-ad5d-4c6d-a3bf-0167a4622e32] Stack "Keyserver" [cb67eec5-ba73-4aa7-b36d-20f5ef75e8e1]
2014-05-20 11:30:02.653 15470 INFO heat.engine.resource [-] deleting ElasticIpAssociation "Floating-IP" Stack "Keyserver-Instance-p7hxrwfsofht" [0460402e-ad5d-4c6d-a3bf-0167a4622e32]
2014-05-20 11:30:02.820 15470 INFO urllib3.connectionpool [-] Starting new HTTP connection (1): 192.168.122.36
2014-05-20 11:30:02.998 15470 INFO urllib3.connectionpool [-] Starting new HTTP connection (1): 192.168.122.36
2014-05-20 11:30:03.260 15470 ERROR heat.engine.resource [-] Delete ElasticIpAssociation "Floating-IP" Stack "Keyserver-Instance-p7hxrwfsofht" [0460402e-ad5d-4c6d-a3bf-0167a4622e32]
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource Traceback (most recent call last):
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/heat/engine/resource.py", line 683, in delete
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     handle_data = self.handle_delete()
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/heat/engine/resources/eip.py", line 241, in handle_delete
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     server.remove_floating_ip(self.properties[self.EIP])
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/novaclient/v1_1/servers.py", line 130, in remove_floating_ip
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     self.manager.remove_floating_ip(self, address)
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/novaclient/v1_1/servers.py", line 631, in remove_floating_ip
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     self._action('removeFloatingIp', server, {'address': address})
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/novaclient/v1_1/servers.py", line 1179, in _action
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     return self.api.client.post(url, body=body)
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/novaclient/client.py", line 286, in post
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     return self._cs_request(url, 'POST', **kwargs)
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/novaclient/client.py", line 260, in _cs_request
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     **kwargs)
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/novaclient/client.py", line 242, in _time_request
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     resp, body = self.request(url, method, **kwargs)
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/novaclient/client.py", line 236, in request
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource     raise exceptions.from_response(resp, body, url, method)
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource ClientException: Floating ip 192.168.122.69 is not associated with instance 7b6d9ce5-92dd-40a5-97ce-ea0edbea364f. (HTTP 422) (Request-ID: req-56c74980-b9b8-4e5d-a3bc-87f63263c226)
2014-05-20 11:30:03.260 15470 TRACE heat.engine.resource 
2014-05-20 11:30:03.561 15470 ERROR heat.engine.resource [-] Delete NestedStack "Instance" [0460402e-ad5d-4c6d-a3bf-0167a4622e32] Stack "Keyserver" [cb67eec5-ba73-4aa7-b36d-20f5ef75e8e1]
2014-05-20 11:30:03.561 15470 TRACE heat.engine.resource Traceback (most recent call last):
2014-05-20 11:30:03.561 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/heat/engine/resource.py", line 692, in delete
2014-05-20 11:30:03.561 15470 TRACE heat.engine.resource     while not self.check_delete_complete(handle_data):
2014-05-20 11:30:03.561 15470 TRACE heat.engine.resource   File "/usr/lib/python2.6/site-packages/heat/engine/stack_resource.py", line 261, in check_delete_complete
2014-05-20 11:30:03.561 15470 TRACE heat.engine.resource     raise exception.Error(nested_stack.status_reason)
2014-05-20 11:30:03.561 15470 TRACE heat.engine.resource Error: Resource DELETE failed: ClientException: Floating ip 192.168.122.69 is not associated with instance 7b6d9ce5-92dd-40a5-97ce-ea0edbea364f. (HTTP 422) (Request-ID: req-56c74980-b9b8-4e5d-a3bc-87f63263c226)
2014-05-20 11:30:03.561 15470 TRACE heat.engine.resource