Bug 969689: Update hgtool from upstream. r=me
Bug 971883: remove vmem from collectd and add cpu aggregation; r=dustin
Merge default -> production

--HG--
branch : production