added Solaris IPS pkg module, updated pkg providers list
Merge remote-tracking branch 'upstream/develop' into solaris-ips
modified module docs
smf support cleanup

If it works on SmartOS and it works on Solaris, it's just plain the
right way to do things.
Remove the if statement.
modules.lxc: don't pass fstype or size for btrfs
Merge branch 'bp-14324' into 2014.7
Merge pull request #14330 from thatch45/2014.7

forward merge lxc fixes
Remove ssh hard dependency on a user's homedir.

Fixes issue #13458.

If the key lives under a user's homedir then there is still
a requirement of the homedir existing.  This is to preserve the previous
behavior.
Merge branch 'develop' of https://github.com/saltstack/salt into fix_13458
Fix copy-pasta error in user_update example.
corrected ling errors on solarisips.py
Merge remote-tracking branch 'upstream/develop' into solaris-ips
Pylint caller.py
Merge pull request #14341 from cachedout/caller_pylint

Pylint caller.py
Merge pull request #14306 from nshalman/smf-cleanup

smf support cleanup
Removed unused kwarg in boto_elasticache.present
Merge pull request #14342 from rallytime/fix_unused_boto_kwargs

Removed unused kwarg in boto_elasticache.present
Merge pull request #14301 from YanChii/solaris-ips

Add Solaris 11 IPS pkg module
Merge pull request #14335 from hazaelsan/fix_13458

Fix 13458
Merge pull request #14339 from truveris/develop

Fix copy-pasta error in user_update example.