Add a Debian init script for salt-api
Fixing a reported issue when using file.append to append strings to a file when the string contains an equal sign.  Also added the fix to file.prepend and file.write.
Merge pull request #14644 from garethgreenaway/14626_file_append

Fix to file.append
Tweak comment message formatting so that it doesn't outwit pylint

Also, this is marginally more efficient due
to removing unnecessary dict accesses.

Old:
    ret['comment'] = some_format_string
    ret['comment'] = ret['comment'].format(...)
New:
    ret['comment'] = some_format_string.format(...)
    # ...with some extra syntactic complications due to complying
    # with line length limits.
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.
Merge pull request #14649 from hulu/str-format-tweak

Tweak comment message formatting so that it doesn't outwit pylint
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 support for Ubuntu in localmod.py
Merge pull request #14657 from dudz94/develop

Add support for Ubuntu in localmod.py
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
Merge branch '2014.7' into develop
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
Merge branch '2014.7' into develop