Automatic merge from submit-queue controller: a couple of fixes for csr Fixes: * delete resource handler wasn't taking into account tombstones * csr would requeue twice on update failure @deads2k @mikedanese ptal