More fixes for socket issue#2710

sjpotter merged 4 commits intoredis:v5redis/node-redis:v5from

sjpotter:more-fixsjpotter/node-redis:more-fixCopy head branch name to clipboard