Remove unused import
CASSANDRA-6876 follow-up
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk