Add CL.LOCAL_ONE and update depency to C* 1.2.12

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

Conflicts:
	driver-core/src/main/java/com/datastax/driver/core/ConsistencyLevel.java
	pom.xml