Bug 920626: collectd deployment batch 2; r=dustin