Fix deadlock in BlockManager reregistration triggered by failed updates.
Handle duplicate registrations better.