states.group: rm unused import `grp`

************* Module salt.states.group
salt/states/group.py:33: [W0611(unused-import), ] Unused import grp
fix bad indentation in salt/states/group.py

************* Module salt.states.group
salt/states/group.py:134: [W0311(bad-indentation), ] Bad indentation. Found 16 spaces, expected 12
Fix permissions of the ssh-id-wrapper script
lint modules/groupadd.py

************* Module salt.modules.groupadd
salt/modules/groupadd.py:184: [C0304(missing-final-newline), ] Final newline missing
salt/modules/groupadd.py:167: [W0702(bare-except), deluser] No exception type(s) specified
avoid shadowing configfile() func in apache state
pass along connection_args in modules.keystone.endpoint_create()

************* Module salt.modules.keystone
salt/modules/keystone.py:279: [W0613(unused-argument), endpoint_create] Unused argument 'connection_args'
avoid shadowing outer config() func in modules.apache._parse_config()

************* Module salt.modules.apache
salt/modules/apache.py:381: [W0621(redefined-outer-name), _parse_config] Redefining name 'config' from outer scope (line 410)
Merge pull request #11287 from cvrebert/patch-3

lint modules/groupadd.py
Merge pull request #11291 from hulu/apache-config-shadow

avoid shadowing outer config() func in modules.apache._parse_config()
Merge pull request #11290 from hulu/keystone-light

pass along connection_args in modules.keystone.endpoint_create()
Merge pull request #11286 from cvrebert/patch-2

fix bad indentation in salt/states/group.py
Merge pull request #11285 from cvrebert/patch-1

states.group: rm unused import `grp`
Merge pull request #11289 from hulu/apache-shadowing

avoid shadowing configfile() func in apache state
Merge pull request #11288 from mtorromeo/fix/ssh-wrapper-mode

Fix permissions of the ssh-id-wrapper script
Fix file perm checker tests
whitespace
Merge remote-tracking branch 'upstream/develop' into sam_raet_25