Another DeprecationWarning.
Merge branch 'develop' of github.com:saltstack/salt into fix_depwarnings
#11162 Fix user.present. When a user already exists and their home directory changes we need to move their own directory to the new directory
Merge remote-tracking branch 'upstream/develop' into develop
Make sure the home directory is not change during test run
Merge branch 'develop' into lxc
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.
Integration tests for changing user info in mac_user module
Merge branch 'develop' of https://github.com/saltstack/salt into mac_user_test
clean-up after changing user info tests
destructive tests
Add two tests for checking file permissions when file is already existing
allow lists for _run_check

added all() for onlyif, unless, and creates
fix pep8 in salt/states/cmd.py
Rewrite jid comparison for keep_jobs

Previous iteration was naive, just converted the first 10 characters of
the jid to integers and subtracted.  However, that means that any time
we go tick over midnight, it adds 76 to the difference (since hours are
not tracked in base 10).  Now, we parse out the jid, convert to a
datetime object, and compare using a timedelta object.
Convert the jid pieces to integers, check for errors
Proof of concept work for group support in eauth.

Debugging code still in place.
Scrub directory if there's no jid file (corrupted entry)