Remove the unused defaultConsistency from ModificationStatement
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Ignore pre-truncate hints
patch by Alexey Zotov and jbellis; reviewed by vijay for CASSANDRA-4655
merge from 1.2
Merge remote-tracking branch 'origin/trunk' into trunk