Avoid error in pip uninstall

Closes #14295
Added role field to SaltKeep
Updated the contributor documentation with the new branching workflow
Fix 'stop' for RedHat salt-api init script
Merge pull request #14384 from whiteinge/doc-merge-forward

Updated the contributor documentation with the new branching workflow
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
Merge pull request #14392 from SmithSamuelM/sam_2014.7

Road Keep cache files now have role field.
Merge pull request #14385 from whiteinge/salt-rhel-salt-api-init-stop

Fix 'stop' for RedHat salt-api init script
Remove unnecessary print statement
Merge pull request #14373 from cachedout/14295

Avoid error in pip uninstall
dont fail if data.p is empty
Merge branch 'bp-14388' into 2014.7
Merge pull request #14399 from thatch45/2014.7

backport #14388
Remove unused arguments in proxmox module
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
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
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