back port fix for #13091
fix pylint

Conflicts:
	salt/modules/iptables.py
fix eventlisten positional
fix problem from ce792ec6
Merge pull request #13094 from gtmanfred/2014.1

back port fix for #13091