Merge "objectcache: convert APC and hash BagOStuff to using mergeViaCas()"