Updated the Mongo Java driver as per https://jira.mongodb.org/browse/JAVA-710, which handles the issue of improved timeout handling. Yes, this is risky as it’s a prerelease of the driver which has not yet made it public, but it does seem better than the current release.