Yousong Zhou <yszhou4tech@gmail.com> made a couple of useful fixes mostly for the xl2tpd-control tool which was broken. imported them (patches/2*) here. Signed-off-by: Daniel Golle <daniel@makrotopia.org>