Merge "objectcache: add object segmentation support to BagOStuff"