Merge "objectcache: add object segmentation support to BagOStuff"

diff --cc autoload.php
Simple merge

diff --cc includes/libs/objectcache/BagOStuff.php
Simple merge

diff --cc includes/objectcache/SqlBagOStuff.php
Simple merge