Merge pull request #4 from susman/upgrade_collectd

upgrade collectd
Merge pull request #5 from susman/upgrade_collectd

add missing patches