update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407
Merge branch 'cassandra-2.0' into trunk
make log parms/markers the same
Merge branch 'cassandra-2.0' into trunk