Allow a resource delete to be re-attempted.

If a resource is in a DELETE IN_PROGRESS state, and the resource
is deleted again, another attempt will be made to delete the resource.

Fixes bug: #1193975

Change-Id: I615612b4e5f21f2a2cb168f47c33a8f9db7e9e81
Merge "Allow a resource delete to be re-attempted."