Track added sstable size correctly

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

Conflicts:
	CHANGES.txt