Fix tracing of local portions of range slices

Patch by Tyler Hobbs; review by Brandon Williams for CASSANDRA-7599
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk