Adds IconsistencyError to Redis connection_errors
Redis: Adds transport option: socket_timeout.  Closes celery/celery#1221
Merge branch '2.5' of github.com:celery/kombu into 2.5