Fix regression from JAVA-201

JAVA-213 #fixes
Merge branch '1.0' of https://github.com/datastax/java-driver into 1.0