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
fix build, sort of
Don't provide oldCfId for post-1.1 system cfs

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5490
Fix primary range ignores replication strategy patch by yukim; reviewed by jbellis for CASSANDRA-5424
Spelling and grammar errors in cassandra.yaml
patch by jhanna reviewed by dbrosius for CASSANDRA-5471
use long math for long values
Merge branch 'cassandra-1.1' into cassandra-1.2
Revert "Always record row-level tombstones in index component; this time from the correct feature branch"

This reverts commits 811f82c5b151bb1f6178392470981883d5e1dfc5, 317ab72a8cc067bd16db63d9e6c19390e96075f9, 344f5fa5af64b601751269fc570fbf4de930e9e2, d7a09825025374b6a49a250467039dc15f36d053.
merge from cassandra-1.2
fix merge