fixing a bug in ipset.py state.  adding a check for iptables --set argument to override to --match-set.
Merge pull request #11795 from garethgreenaway/develop

Fixes to ipset state and iptables module