Fix columns expiring in the middle of 2 phase compactions

patch by slebresne; reviewed by jbellis for CASSANDRA-5799
3 files changed