Another DeprecationWarning.
Merge branch 'develop' of github.com:saltstack/salt into fix_depwarnings
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.
Initial public commit of the vsphere driver
Integration tests for changing user info in mac_user module
Changed sl to ml as it is more meaninglful as the message length and less likely to be confused with the
length of a single segment not all the segments together which it is
Merge branch 'develop' of https://github.com/saltstack/salt into mac_user_test
Merge remote-tracking branch 'upstream/develop' into sam_raet_26
initial addition of a smtp module and state.  can be used in a similiar fashion to the xmpp module and state to send emails following state changes.  Configuration for smtp usernamd and password is done in a similiar way to the XMPP module with the information kept on the minion.
clean-up after changing user info tests
destructive tests