Optimize partitioner tokens

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