fix countAllBatches query
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-7300
Merge branch 'cassandra-2.1' into trunk