Bug 870853: collectd bustage, 3rd x a charm. fixed dep cycle; r=dustin via irc