Fix streaming RangeTombstones at column index boundary; patch by slebresne reviewed by yukim for CASSANDRA-5418
initial CAS support
patch by jbellis and slebresne for CASSANDRA-5062
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnIndex.java
	src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
fix merge failure
remove PBSPredictor
patch by jbellis; reviewed by marcuse for CASSANDRA-5455