Fix remove_and_add_spares removes drive added as spare in slot_store