Merge pull request #19396 from hnyman/collectd-nut