Don't expire columns sooner than they should with 2ndary indexes

patch by amorton; reviewed by slebresne for CASSANDRA-5079

Conflicts:
	CHANGES.txt