Fix range merging when DES scores are zero
patch by thobbs; reviewed by jbellis for CASSANDRA-7535
merge from 2.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk