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 #14599 from cachedout/rpm_redir_2014_7

Avoid redirects for RHEL5 RPMs to workaround a bug in RPM
Merge branch '2014.7' into develop