Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285
Merge branch 'cassandra-2.1' into trunk