Fixing it to append a trailing slash in end
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)
Testing abspath instead of normpath
Appending trailing slash if not present
Making note in docs and changing example
Removing trailing whitespace
Change the error message to show actually what's tested
Added a dictionary subclass that supports dot-lookup notation
Switch __salt__ to use the dot-lookup subclass
Added tests for calling functions via Jinja with dot-lookup syntax

Yay!
Merge pull request #14500 from thatch45/develop

merge up 2014.7
fix issues with keepalive minion
Improving docs for salt.modules.apache
Merge pull request #14502 from nmadhok/improve-module-docs

Improving docs for salt modules
Add support for pre_releases argument to the gem state
Merge pull request #14269 from whiteinge/test-dotlookup-notation

Add a bug fix plus tests for calling functions in Jinja via dot-lookup notation
Merge pull request #14298 from mbirtwell/dont_drop_events_during_gather_job_info

Dont drop events during gather job info
Load netapi modules using client config instead of master config
Merge pull request #14488 from nmadhok/test-file-makedirs-func

Test file makedirs func