Merge pull request #19385 from hnyman/collectd-nut