Merge pull request #6104 from terminalmage/quickfix

remove _pkgname_without_arch (and refs)
salt/modules/omapi.py: rm unused imports

************* Module salt.modules.omapi
W0611: 16,0: Unused import base64
W0611: 19,0: Unused import salt
states/iptables.py: rm unused imports

************* Module salt.states.iptables
W0611: 23,0: Unused import sys
W0611: 24,0: Unused import pprint
modules/iptables.py: fix pylint W1401 (Anomalous backslash in string)
solaris_group, pw_group: add missing imports and logger creations
states.mount: fix typos; want assignment, not equality
states/service.py: rm unused import of `sys`

************* Module salt.states.service
W0611: 39,0: Unused import sys
Merge pull request #6107 from cvrebert/patch-3

states/iptables.py: rm unused imports
Merge pull request #6108 from cvrebert/patch-4

modules/iptables.py: fix pylint W1401 (Anomalous backslash in string)
Merge pull request #6106 from cvrebert/patch-2

salt/modules/omapi.py: rm unused imports
Merge pull request #6109 from hulu/group-modules-fixes

solaris_group, pw_group: add missing imports and logger creations
Merge pull request #6110 from cvrebert/patch-5

states.mount: fix typos; want assignment, not equality
Merge pull request #6111 from cvrebert/patch-6

states/service.py: rm unused import of `sys`
ddns: add add_host and delete_host functions
Merge pull request #6112 from mgwilliams/ddns

ddns: add add_host and delete_host functions
Error on completely invalid kwd args; follow-up to #6093
Merge pull request #6115 from hulu/extra-kwargs-err-check

Error on completely invalid kwd args; follow-up to #6093
Change behavior of apt._clean_pkglist

The current behavior of this function will remove all instances of '1'
from the version list for a package. If the list only contains multiple
instances of '1', this will clear the list though, and that's not what
is wanted. The intention I had for this function when I wrote it was to
strip all virtual package markers if that package is both a real package
and virtual package, but also to take instances where more than one
target of a virtual package is installed, and make it so that only one
instance of '1' is in the version list for that package. This commit
adjusts the behavior to work that way.