Add a Debian init script for salt-api
removing logging from module schedule.py, not in use.
Merge pull request #14652 from garethgreenaway/remove_log_debug_schedule

removing logging from module schedule.py, not in use.
Add missing code block to saltmod state docs
Merge pull request #14642 from krallin/2014.7

Add a Debian init script for salt-api
Merge pull request #14654 from whiteinge/doc-saltmod-state

Add missing code block to saltmod state docs
Add GPG key file to integration tests
Since this was changed to use channels this is no longer necessary, since the channel does this under the hood
Remove another weird hard-coded sleep

If this is an issue we need something other than sleeps ;)

similar to #14223
Backport #14263 to 2014.7
Fixed augeas import
Revert "bug: syndic does not return in 1 seconds"

This reverts commit 14fb6880543093dff77b9d41f6d16d43167be4bd.

Conflicts:
	salt/client/__init__.py

See my comments on PR#10336. That commit looked wrong to me and I got
no response to my query. It understandable that the change wouldn't have
caused much pain for most people but I suspect that commit 36601005 is
rendered unnecessary by reverting this.
Disable check for all minions returned when using syndic

This optimisation meant that if all minions targeted were connected to
syndics, rather than directly we would never look for events
Backport #14297 to 2014.7
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)
Backport #14298 to 2014.7
salt.key: rm duplicate import of salt.crypt

************* Module salt.key
salt/key.py:21: [W0404(reimported), ] Reimport 'salt.crypt' (imported line 16)
Backport #14311 to 2014.7
Remove ssh hard dependency on a user's homedir.

Fixes issue #13458.

If the key lives under a user's homedir then there is still
a requirement of the homedir existing.  This is to preserve the previous
behavior.