high-scale-lib upgrade

Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
Merge branch 'cassandra-2.1' into trunk