Fix marking commitlog segments clean
patch by bes; reviewed by jbellis for CASSANDRA-6959
Fix CollectionTypeTest
Merge branch 'cassandra-2.1' into trunk
Fix potential NumberFormatException when deserializing IntegerType

patch by slebresne; reviewed by jbellis for CASSANDRA-7088
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk