Merge "objectcache: remove redundant merge() definitions"