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
Allow the VT tests to run on OSX
add user and signal args
Clean up apache.state example usage.
Merge pull request #14384 from whiteinge/doc-merge-forward

Updated the contributor documentation with the new branching workflow
Get rid of unnecessary(?) _check_name.
Eliminate import of salt.utils.cloud.
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
Improve the handling of errors during salt-ssh refresh of the thin client.
This corrects a syntax error for the sudo command, normally 'username -c' is associated with 'su'