Merge "objectcache: Add BagOStuff::getWithSetCallback() convenience method"