Track added size correctly

Patch by marcuse; reviewed by jbellis for CASSANDRA-7239
Merge branch 'cassandra-2.1' into trunk