Add support for Digital Ocean's API v2
Fix doc salt.states.file
Removing trailing whitespace
Add a comment explaining the except
Add "wait_for_kill" to process_manager to avoid join() stalling forever
Make sure to not stall (just in case)
Fix regression in url encoded salt-api messages

Most clients that do url encoding include other data in the Content-Type field (requests for example sets "application/x-www-form-urlencoded; charset=utf-8"). This changes the api to be a more forgiving server which will make any non-list struct a list
Make this a debug line, we see it a lot and don't really care :)
Don't need to connect to the publish sockets, it will do that automatically when you ask for an event
Fix salt-ssh return value handling.
Revert commit 1a90b5f.
Fix salt.states.rabbitmq_plugin:disabled.__doc__
First pass at adding functionality to disable state runs.  These can be highstate, sls files or state functions.
Merge pull request #15835 from wesleylancel/digital-ocean-api-v2

Add support for Digital Ocean's API v2
Merge pull request #15837 from nmadhok/fix-doc

Fix doc salt.states.file
Merge pull request #15849 from jacksontj/develop

Add a comment explaining the except
Merge pull request #15860 from kostko/fix-salt-ssh-ret

Fix salt-ssh return value handling
Merge pull request #15861 from kostko/revert-15550

Unbreak salt-ssh highstate TypeError
Use octal.

Since it's a permission. I can't do decimal -> octal -> unix perms in my head.
Merge pull request #15871 from graingert/patch-2

Fix salt.states.rabbitmq_plugin:disabled.__doc__