Tundra: s3 datastore housekeeping
Tundra: add simple disk datastore