Fix EstimatedHistogram races
patch by Paulo Gaspar; reviewed by jbellis for CASSANDRA-6682
Merge branch 'cassandra-2.0' into trunk