Backport the collectd portion of the treewide changes made by e38c10061 in master Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
e38c10061