Invalid streamId in cql binary protocol when using invalid CL

patch by slebresne; reviewed by pchalamet for CASSANDRA-5164
Fix validation for IN where clauses with collection

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5376
Copy ResultSet on count query to avoid ConcurrentModificationException

patch by slebresne; reviewed by jbellis for CASSANDRA-5282
Correctly typecheck in CQL3 even in presence of ReversedType

patch by slebresne; reviewed by jbellis for CASSANDRA-5386
Fix the fat client.
Patch by Carl Yeksigian, reviewed by brandonwilliams for CASSANDRA-5378
Fix streaming compressed files when using encryption; patch by yukim reviewed by iamaleksey for CASSANDRA-5391
Fix StorageServiceClientTest
remove the index entry on oldColumn when new column is a tombstone
patch by jbellis; reviewed by Sam Tunnicliffe for CASSANDRA-5395
avoid duplicate index entries ind PrecompactedRow and ParallelCompactionIterable
patch by jbellis; reviewed by Sam Tunnicliffe for CASSANDRA-5395
comment
clean up string concatenation in logging
add netty.jar as a dependency for all-pom
patch by sbridges reviewed by dbrosius
add #5392 to changes.txt
Fix writetime/ttl functions on columns with null values

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5341
Fix NPE during cql3 select with token()

patch by slebresne; reviewed by driftx for CASSANDRA-5404
Fix cf name extraction from manifest in Directories.migrateFile()

patch by Marcus Eriksson; reviewed by Aleksey Yeschenko for
CASSANDRA-5242
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Directories.java
IndexHelper.skipBloomFilters won't skip non-SHA filters
patch by Carl Yeksigian; reviewed by jasobrown for CASSANDRA-5385
cqlsh: Print maps ordered by key, sort sets

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5413
OCD-ninja CFMetaData.BatchlogCF -> CFMetaData.BatchlogCf fix