fix tests
update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407
make log parms/markers the same
Fix releasing CF metrics

patch by Russell Spitzer; reviewed by Aleksey Yeschenko
Avoid StackOverflow with large IN queries

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

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
fix bad merge
Mark EPS as dead before sending echo command.
Patch by Sankalp Kohli, reviewed by brandonwilliams for CASSANDRA-6571
Remove dead code

patch by slebresne; reviewed by jbellis for CASSANDRA-6580
Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6495
Remove time penalty from DES.
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6465
Don't shutdown a nonexistant native server on 1.2, either.
Merge branch 'cassandra-1.2' into cassandra-2.0
Add LOCAL_SERIAL to ThriftConversion
Patch by brandonwilliams for CASSANDRA-6584
update changes
Initial pass at deferring the release of new sttables until a stream session is complete. CASSANDRA-6503
split FileMessage into two: IncomingFileMessage and OutgoingFileMessage. Also extended StreamMessage.Type
to have both an incoming message serializer and deserializer; needed this to support Type.File having two diff serializers
as java generics would not let me return different subclasses (of FileMessage) from the original FM.Serializer. Hence, needed to
brea it into two serializers, and thus extend SM.Type.
aborting the SSTW when the session closes with a failure state