[packages_10.03.2] rp-l2tp: merge r29049, r29199