fix duplicate classes between cassandra-all and cassandra-thrift

patch by dbrosius reviewed by jbellis for CASSANDRA-5833
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk