Fix #236: Upgrade to latest curator and enhance it so that clients are not blocked waiting for a connection when shutting down