Switch from redis-py-cluster to redis-py #2552

As documented, redis-py-cluster has reached EOL. It is now being merged into redis-py. We previously tried to switch from redis-py-cluster to redis-py but ran into various issues; see #2328. The upstream bug has since been fixed, so we can now switch from redis-py-cluster to redis-py.