fix ClassCastException for #6462
Merge branch 'cassandra-2.0' into trunk
CHANGES
Merge branch 'cassandra-2.0' into trunk