remove calculation of unused  expected compacted filesize
Merge branch 'cassandra-1.2' into cassandra-2.0