Fix assertion failure in filterColdSSTables
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-6483
fix race referencing tokenMetadataCache
patch by jbellis; reviewed by rbranson for CASSANDRA-6485
merge from 1.2
r/m Test.iml
Improve batchlog write performance with vnodes

patch by Jonathan Ellis and Rick Branson; reviewed by Aleksey Yeschenko
for CASSANDRA-6488
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Slightly improved message when parsing properties for DDL queries

patch by boneill42; reviewed by slebresne for CASSANDRA-6453
caching all calls of cloneOnlyTokenMap is not correct since many callers mutate the result
patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-6488
merge from 1.2
Simplify TokenMetadata.cachedOnlyTokenMap()
Merge branch 'cassandra-1.2' into cassandra-2.0
ninja-correcting the the constant for LOCAL_ONE.
Merge branch 'cassandra-1.2' into cassandra-2.0
ninja-correcting the the constant for LOCAL_ONE in v2 of the native_protocol doc.
Fix size-tiered compaction in LCS L0
patch by jbellis; reviewed by Marcus Eriksson and tested by Nikolai Grigoriev for CASSANDRA-9496
cleanup + debug logging
loop based on isClosed to accomodate SSL sockets
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6349
Allow executing CREATE statement multiple times

patch by slebresne; reviewed by jbellis for CASSANDRA-6471
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Fix infinite loop when paging queries with IN

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6464