Improve error message
Disallow updating CQL3 tables from thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-6370
Fix size computation of prepared statements

patch by slebresne; reviewed by lyubent for CASSANDRA-6369
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/thrift/CassandraServer.java
Fix typo
Merge branch 'cassandra-1.2' into cassandra-2.0

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

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
add missing String.format parameter
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Merge branch 'trunk' into work
Add missing file
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix TokenMetadataTest
remove unnecessary(and failing) test
Merge branch 'cassandra-2.0' into trunk
Fix ScrubTest
Fix LeaveAndBootstrapTest
Fix potential ConcurrentModificationException in tests