Recover_from_tombstone insanely slow

We’ve made some improvements to the uploads:recover_from_tombstone rake task.

It even has its own tested class now :wink: thanks to @tgxworld and @vinothkannans