Return a tuple instead of list.
Patch by Mikhail Stepura for CASSANDRA-6770.
Merge branch 'cassandra-2.1' into trunk