Avoid overlap in L1 when L0 contains many non-overlapping sstables

Patch by marcuse; reviewed by yukim for CASSANDRA-8211
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt