Ensure that if we are shutting down, and the worker is taking a long time to establish a client connection, then we do not hang the shutdown doing so.
Merge bug25996
stable to default