Merge "objectcache: add $flags argument to BagOStuff::delete()"