Merge "objectcache: make the BagOStuff::add() operation more atomic for WinCache"