Merge remote-tracking branch 'remotes/upstream/2.12.x' into mongolab-java-driver-2.12.x

Conflicts:
	pom.xml