Prepare merge from 2.1.
Prepare merge from 2.1.

Empty commit as the changes will be cherry-picked manually.

tolbertam/java-driver,mebigfatguy/java-driver,mebigfatguy/java-driver,tolbertam/java-driver,mebigfatguy/java-driver,tolbertam/java-driver