Restore expiring->deleted (cell) compaction optimization

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6844