Fix merge issues with 3.2 backports.
Fix merge issues with 3.2 backports.

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