Compact hottest sstables first and optionally omit coldest
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-6109
add generation back to bucketing (filtering) sort
update COLD_READS_TO_OMIT_KEY
Remove CHANGES.txt dups
Make MS.getBoundTerms() correct for batched statements

patch by Aleksey Yeschenko and Sam Tunnicliffe; reviewed by
Sylvain Lebresne
Fixes for compacting larger-than-memory rows
patch by jbellis; reviewed by marcuse for CASSANDRA-6274
Remove multithreaded compaction and PCR
patch by jbellis; reviewed by marcuse for CASSANDRA-6142
Merge branch 'cassandra-2.0' into trunk
merge from 2.0
restrict max_num_tokens to 1536
patch by jbellis; reviewed by brandonwilliams and Quentin Conner for CASSANDRA-6267
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Remove CFDefinition

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6253
Reject CAS queries with the native protocol v1

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6270
Merge branch 'cassandra-2.0' into trunk
Use non-pooled SegmentedFile builders when bulk loading
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6272
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
	test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
Merge branch 'cassandra-2.0' into trunk
Nodetool gets default JMX port from cassandra-env.sh
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6273
Merge branch 'cassandra-1.2' into cassandra-2.0