Merge "objectcache: make CachedBagOStuff implement makeKeyInternal()"