pick up redis connection fix from upstream

@obrie @deanxorr @will-ob @mattcarbone 

I'm not happy with the way these PRs look since it includes our other commits as well after I rebase onto upstream master.  I'll have a better way to do it next time.

@obrie @deanxorr @will-ob @mattcarbone