[packages_10.03.1] collectd: merge r29489