Tidy up
Adding client options to MongoClientImpl.  Still don't understand why the tests are only failing on Jenkins and not locally.