Merge branch 'develop' of github.com:saltstack/salt into develop
Tiny fix for iptables... a recent change broke certain usage of dport(s) and sport(s) when the value is an int (code prior to this commit assumes it is a string and tries to call .startswith(..) on it).
Merge pull request #12239 from sandbender/fix_iptables_dport_and_sport

Fix iptables dport and sport