fix parameter order in error message for #5596
Merge branch 'cassandra-1.2' into trunk