fix format string to match count of values
Merge branch 'cassandra-2.1' into trunk