Fix merge conflicts from 3.2.
Fix merge conflicts from 3.2.

louisliangjun/redis,louisliangjun/redis,maodeyi/redis_lua,splitice/redis,louisliangjun/redis,splitice/redis,ramonsnir/redis,splitice/redis,ramonsnir/redis,maodeyi/redis_lua,ramonsnir/redis,louisliangjun/redis,splitice/redis,maodeyi/redis_lua