Merge in upstream redis.conf changes.