Fix ClassCastException for compact table with composites

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6738
Merge branch 'cassandra-2.1' into trunk