Merge "Bug 3681 - Uncaught ConnectException leaves library in bad state" into stable...