Merge "objectcache: Support key versioning in WANObjectCache"