Fix native protocol spec v2
Add CQL-aware SSTableWriter

patch by slebresne; reviewed by jbellis for CASSANDRA-5894
Add beforeChange notification to IEndpointStateChangeSubscriber
Patch by Sergio Bossa, reviewed by brandonwilliams for CASSANDRA-6135
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
restrict max_num_tokens to 1536
patch by jbellis; reviewed by brandonwilliams and Quentin Conner for CASSANDRA-6267
merge from 1.2
Reject CAS queries with the native protocol v1

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6270
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
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
fix sstr test
Skip loading corrupt key cache
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6260
Fix repair assertionerror when tombstones expire
patch by jbellis for CASSANDRA-6277
mention 5950 in NEWS