Improve initial FD phi estimate when starting up
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6385
merge from 1.2
convert sum to double before dividing
Merge branch 'cassandra-2.0' into trunk
Merge remote-tracking branch 'origin/trunk' into trunk
make inner class static
Merge branch 'cassandra-2.0' into trunk