Another DeprecationWarning.
Merge branch 'develop' of github.com:saltstack/salt into fix_depwarnings
fixed typo
salt.modules.seed: fix bug in _check_install
salt.modules.lxc & salt.runners.lxc: improve cloning support
salt.runners.lxc: remove unused, commented code
salt.modules.seed: remove debug code
#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' 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.
Merge remote-tracking branch 'upstream/develop' into sam_raet_25
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
Fix permissions of the ssh-id-wrapper script
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'