Tuple types

patch by slebresne; reviewed by thobbs for CASSANDRA-7248
Merge branch 'cassandra-2.1' into trunk