Merge branch '3340-fix-dns-timeout' of https://github.com/cloudant/couchdb-couch-log