Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Fix possible overflow while sorting CL segments for replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
merge from 2.0
Merge branch 'cassandra-2.1' into trunk