Merge "Switch to decorators.idempotent_id on object_storage"