Merge "Fixes to MemcachedBagOStuff::makeKeyInternal()"