Remove vm_config and vm_config_path from config.cloud_config function
Deprecate libcloud_version from salt/cloud/libcloudfuncs
Remove CloudConfigMixIn class from salt/utils/parsers (deprecated)
Remove cloud_config tests for deprecated arguments
Don't try to look in nonexistant backup dir
Merge pull request #14332 from rallytime/cloud_deprecations

Cloud deprecations for Helium
Pylint caller.py
Merge pull request #14344 from terminalmage/issue14261

Don't try to look in nonexistant backup dir
"Hide" `contextmanager` and `depends` from salt's loader
Merge pull request #14347 from s0undt3ch/2014.7

[Cherrypick from develop] Pylint caller.py
Merge pull request #14349 from s0undt3ch/develop

"Hide" `contextmanager` and `depends` from salt's loader
Merge branch '2014.7' of https://github.com/saltstack/salt into develop
Fix unused arguments in S3 external pillar
Merge pull request #14350 from terminalmage/issue14322

Fix unused arguments in S3 external pillar
Merge remote-tracking branch 'upstream/2014.7' into develop
Fix paths in proxyminion example

Default pillar root is /srv/pillar, not /srv/salt/pillar.
Remove references to deprecated config options
Merge pull request #14361 from pass-by-value/remove_config_references2

Remove references to deprecated config options
Merge branch '2014.7' into develop