Fixup for CASSANDRA-6831 on 2.1
Fix super column filter conversion

patch by slebresne; reviewed by thobbs for CASSANDRA-7138
Fix ClassCastException on composite dense tables

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