Clean up generics in dht package

Patch by blambov, reviewed by jmckenzie for CASSANDRA-8171
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java
	src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java