Make SS look at the right piece for expire time.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857
Merge branch 'cassandra-1.2' into cassandra-2.0.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Remove jvm revision checks.. for now
Merge branch 'cassandra-2.0.0' into cassandra-2.0