Merge "objectcache: make MultiWriteBagOStuff handle duplicate add() operations"