FT-633 fix remove_from_lock_requests invariant