Merge "Use WANObjectCache::makeKey() in ChangesFeed"