Fix race when multiple connect are done in parallel

JAVA-261 #fixes
Merge branch '1.0' into 2.0

Conflicts:
	driver-core/src/main/java/com/datastax/driver/core/Cluster.java