Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter
patch by jbellis; reviewed by yukim for CASSANDRA-5900
merge from 1.2
merge from 2.0.0
Merge branch 'cassandra-2.0' into trunk