fix duplicate classes between cassandra-all and cassandra-thrift

patch by dbrosius reviewed by jbellis for CASSANDRA-5833