Update the deallocate_for_instance method

DHC-1474

The parent method changed in the havana cycle so lets copy
it and cherry pick the only change we added.

Change-Id: I40434ad80f72f42e8c1cc0173f9dce67e972c128
Signed-off-by: Rosario Di Somma <rosario.disomma@dreamhost.com>