[xtables-addons/el7] squashed merge master to el7