Fix bad default for min/max timestamp in SSTableMetadata

patch by slebresne; reviewed by jasobrown for CASSANDRA-5372
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
catch NumberFormatException
Make upgradeSSTables skip current version sstables by default

patch by slebresne; reviewed by jbellis for CASSANDRA-5366
Optimize min/max timestamp collection

patch by slebresne; reviewed by jbellis for CASSANDRA-5373
Fix bad default for min/max timestamp in SSTableMetadata

patch by slebresne; reviewed by jasobrown for CASSANDRA-5372
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/CollationController.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java