Pick unused generations when loading new sstables

patch by Tyler Hobbs; reviewed by Jonathan Ellis for CASSANDRA-6514
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Merge branch 'cassandra-2.1' into trunk