Storage API changes

[Cantor, Scott]

Mostly noting for Marvin,

A version of the storage API with some of the annotation work you did is checked in now. I left one bit out, I think it creates more complexity than I'm comfortable with to put the versioning support into the objects directly because of how the API works, but most subsystems won't need the versioning support anyway.

The other fields are all supported, including the context field, so you can just do create(object) and update(object) now. For simple use cases, just make the context a static constant or set to the class name. I like this a lot, thank you.

This all interchanges with the standard methods of course, so you can mix and match for advanced use cases.

I also collapsed the "expiration" and "no expiration" versions of the methods, it was driving me crazy maintaining both.

-- Scott