[packages_10.03.2] rrdcollect: merge r28957