Sets EVENT_QUEUE_TTL=5 and EVENT_QUEUE_EXPIRES=60 by default
Now requires billiard 3.4b1
Autoscale: maybe_scale must accept argument.  Closes #2411
Chord unlock: Retry if deps.ready() raises.  Closes #2404
Merge branch 'master' of github.com:celery/celery