Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
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