Remove resource_id_set(None) calls

This removes resetting resource_id in delete, as the state is storing
that information properly, and it doesn't provide any additional value.

Change-Id: I71f17ab79adbad5286389c87f1fbd5c60c4a8d7f
Closes-Bug: #1358492
Merge "Remove resource_id_set(None) calls"