Merge "objectcache: improve BagOStuff arithmetic method signatures"