Reverts unused changes for aggregated consistent hash
Merge branch 'master' into graphite2