Fix typo

Conflicts:
	salt/modules/pip.py

Conflicts:
	salt/modules/pip.py
Fix `disk.usage` units on Windows

Convert `win32api.GetDiskFreeSpace` Bytes output into 1K-block.
Merge branch 'bp-14594' into 2014.7
Avoid redirects for RHEL5 RPMs to workaround a bug in RPM

Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh
Merge pull request #14597 from zigarn/issue/14596

Fix `disk.usage` units on Windows
Merge pull request #14599 from cachedout/rpm_redir_2014_7

Avoid redirects for RHEL5 RPMs to workaround a bug in RPM
Merge branch '2014.7' into develop
Fixing a broken link and formatting code block
Randomize salt cloud deployment directory

Conflicts:
	salt/utils/cloud.py
Correct path

Conflicts:
	salt/client/ssh/__init__.py
Remove unusued testing code
Use local bootstrap

Conflicts:
	salt/modules/config.py
	salt/modules/seed.py
This fixes two issues #14337 and #13788

use-forking-daemon.patch -> #14337
the other patchesr are for #13788

With thanks to Tim Serong who created the patches.
Fixing bootstrap script to install python-apt for Ubuntu minions and Debian minions greater than the 5.0 (Lenny) release.  With some recent changes related to virtual packages, python-apt is now necessary to be able to manage packages.
Align tmpdir and deploy dir
Merge pull request #14600 from nmadhok/fix-salt-formula-doc-broken-link

Fixing a broken link and formatting code block
Support for new reapeds dict produced by presence management
Requires Raet v02.11
add another example to alias doc
Update docs for using salt-cloud on OSX to install curl-ca-bundle
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7