Fix missing key estimate in nodetool

Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-8400
Merge branch 'cassandra-2.1' into trunk