Add ks.cf names to tombstone logging
patch by Kevin Lovato; reviewed by jbellis for CASSANDRA-6597
Merge branch 'cassandra-2.0' into trunk