Merge "Remove MemcachedClient compat class names"