Ninja-fix typo in Tracing
Add cardinality estimator for key count estimation

patch by yukim; reviewed by jbellis for CASSANDRA-5906
cosmetic change
add IRE for invalid CF supplied to get_count
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
Merge branch 'cassandra-2.0' into trunk