Bug 870853: consolidate collectd includes; r=dustin