Removing variables not needed. replacing values directly
Fix salt-ssh handling of python os.execv
Remove unused arguments in proxmox module
Merge pull request #14377 from basepi/mdadmdocs14368-2

Remove out-of-date example from docs for mdadm
Merge branch '2014.7' into develop
Merge pull request #14404 from rallytime/fix_proxmox_unused_args

Remove unused arguments in proxmox module
Merge pull request #14402 from rallytime/test_cleanup

Remove unnecessary print statement
Handle sudo when re-deploying the shim
Merge pull request #14406 from lyft/LYFT-14491-boto-asg-create-lc-image-id-required

boto_asg - create_launch_configuration - image id required
Merge branch 'develop' of https://github.com/saltstack/salt into fix-raid_devices
Give RHEL5 a fighting chance in the cache test
Merge pull request #14410 from cachedout/rhel5_cache

Give RHEL5 a fighting chance in the cache test
Give rhel5 a chance to pass the cache tests
Merge pull request #14411 from rallytime/fix_rhel5_test

Give rhel5 a chance to pass the cache tests
Merge branch '2014.7' into develop
Add requests to freezer includes

This will be required to run 2014.7.x on Windows
Merge pull request #14412 from terminalmage/update-freezer

Add requests to freezer includes
use sftp to transfer files instead of scp

scp is required to be on both sides of the connection in order to work

└─╼ scp this.py salt:
bash: scp: command not found
lost connection

sftp does not, it is actually built directly into the openssh.

http://www.openssh.com/faq.html#3.7
http://www.openssh.com/faq.html#2.10
Added support for road estate role attribute in key identity
Added tests
Merge pull request #14415 from SmithSamuelM/sam_2014.7

Added support for road estate role attribute in key identity