Fix cqlsh DESC with CompositeType
explanation

patch by mstepura; reviewed by thobbs for CASSANDRA-7399
Fix heap size calculation for CompoundSparseCellName/.WithCollection

patch by Benedict Elliott Smith; reviewed by Dave Brosius CASSANDRA-7421
Merge branch 'cassandra-2.1' into trunk