Merge pull request #10445 from hnyman/collectd-ntp-fix