Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy
patch by Alex Liu; reviewed by jasobrown for CASSANDRA-6238
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
Merge branch 'cassandra-2.0' into trunk