Fixing it to append a trailing slash in end
Merge pull request #3 from lyft/LYFT-14491-resolve-boto-asg-exists-issue

LYFT-14491 - resolve issue with boto_asg.exists
LYFT-14491 - make image-id required
Don't risk missing events in gather_job_info

Seen with syndic, but in theory affects all setups. When a we call
gather_job_info if an event comes in for the main job we can discard the
event whilst we are looking for the gather_job_info event. To work
around I've made gather_job_info add events for the main job to the
pending_events list. get_event now always checks that list for events
matching it's tag

Conflicts:
	salt/utils/event.py
Pull out pending_events changes and reuse

PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
Avoid error in pip uninstall

Closes #14295
Allow OSX to run tests with change to TMPDIR
Merge pull request #14375 from rallytime/run_osx_tests

Allow OSX to run tests with change to TMPDIR
Merge branch '2014.7' into develop
Remove out-of-date example from docs for mdadm, Refs #14368
Skip lxc tests if no lxc and skip failing vt_test if running osx
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
Updated training image
Merge 2014.7 into develop
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
Merge pull request #14382 from s0undt3ch/develop

Forward merge #14378
Added role field to SaltKeep
Updated the contributor documentation with the new branching workflow