Bug 920626: collectd deployment batch 1; r=dustin