This will make sure that when cleanup fails, an exception will be
raised.

This also increases the time we'll try to cleanup in Sidekiq, as it
appeared we still had some failures there.