Merge branch 'develop' of github.com:saltstack/salt into fix_depwarnings
mac_user integration tests
Added more useful SmartOS Zone grains

Added the following fields to SmartOS grains:

 - pkgsrcpath      : Full path to the pkgin repo in use by the zone.
 - zonename        : The internal UUID of the Zone.
 - zoneid          : The internal ID of the Zone.
 - hypervisor_uuid : The UUID of the hypervisor hosting the zone.
 - datacenter      : In Joyent cloud shows the Id of the datacenter.
Fix edge case when rel path changes from file to dir

This fixes an edge case in gitfs where a path that once was a file is
now a directory.
Removed list groups test
Whitespace
Merge pull request #11282 from rallytime/mac_users_test_fix

Removed list groups test
Merge pull request #11280 from terminalmage/issue11181

Fix edge case when rel path changes from file to dir
Merge pull request #11247 from cachedout/11223

Use root_key if auth'ing as root when token is present.
whitespace
Merge pull request #11268 from JensRantil/issue-11198

Highstate output improvements
Merge branch 'pyobjects_loader_and_map' of git://github.com/borgstrom/salt into borgstrom-pyobjects_loader_and_map

Conflicts:
	salt/utils/pyobjects.py
Merge remote-tracking branch 'upstream/develop' into sam_raet_25
Merge pull request #11108 from mlister2006/develop

Manipulating Linux /etc/group group members (Ref: Issue# 11102)
Remove old_present from groups
Merge pull request #11196 from mtorromeo/feature/git-ssh

Implement static git ssh helper
Revert "minor style for for len usage and one "== None" occurrence"

This reverts commit 3cc77e21b5754566160d3e45cac851901d7d06e6.

Conflicts:
	salt/utils/pyobjects.py
Merge remote-tracking branch 'upstream/develop' into sam_raet_25
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