Bug 920626: collectd deployment batch 9; r=dustin