Merge pull request #11786 from garethgreenaway/develop

Fixes to ipset state and module.
Updating iptables module to allow specifying dports and sports as a list in addition to a comma or colon separated string.