Eliminate possibility of CL segment appearing twice in active list
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6557
Merge branch 'cassandra-2.1' into trunk