incorporated JAVA-1098 and JAVA-1154 commit to my impl
upgraded and test  against the mongo 2.12.3 driver