Merge "objectcache: make the $flags argument appear more consistently in BagOStuff"