Merge branch 'master' into dse_3.1

Conflicts:
	driver-core/pom.xml
	driver-core/src/main/java/com/datastax/driver/core/Connection.java
	driver-examples/pom.xml
	driver-examples/stress/pom.xml
	pom.xml