Merge "objectcache: clean up MemcachedBagOStuff expiry handling"