Merge "objectcache: make detectLocalServerCache() prefer apcu over apc"