Merge "objectcache: fix return value type in SqlBagOStuff::incr"