Merge pull request #3316 from mrunge/checkfix_collectd59