Merge pull request #14570 from gtmanfred/2014.7

close pylint errors
Forward merge 2014.7
Merge pull request #14594 from sivir/develop

prevent gitfs.py from changing load variable
prevent gitfs.py changing load variable that is used by other fs modules too
Merge branch 'bp-14594' into 2014.7
Merge branch 'bp-14594' into develop
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
LYFT-14491 - provide subnet to vpc association function
LYFT-14491 - documentation updates to bring inline with Salt style
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