Merge "Improvements to WANObjectCache::getWithSetCallback()"