[packages_10.03.2] pmacct: merge r28468, r28890