[xtables-addons-kmod] Clean-up merge xt addons