Always record row-level tombstones in index component
patch by jbellis; reviewed by jasobrown for CASSANDRA-5487
Revert "Always record row-level tombstones in index component"

This reverts commit 798470e051af794b605cce28031b33b589cfc6d8.
Always record row-level tombstones in index component; this time from the correct feature branch
patch by jbellis; reviewed by jasobrown for CASSANDRA-5487
fix merge
fix merge