Update salt for new remote attributes in Raet
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
Merge pull request #14378 from rallytime/test_cleanup

Skip lxc tests if no lxc and skip failing vt_test if running osx
Merge pull request #14381 from SmithSamuelM/sam_2014.7

Added consistent indexing access to remotes by uid, by name, and by ha
Needs Raet v0.2.05
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