fix format string to match the number of input values
Merge branch 'cassandra-2.1' into trunk