Fixes:
* delete resource handler wasn't taking into account tombstones
* csr would requeue twice on update failure