multipath module added
lint fixes
more lint fixes
function names changed as discussed in pull req
function names changed as discussed in pull req
Merge remote-tracking branch 'origin/devmap' into devmap

Conflicts:
	salt/modules/devmap.py
function names changed as discussed in pull req
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 :)
lint fixes, docstring at beginning of the file
Fix salt-ssh return value handling.
salt.output.nested: rm unused import of sys module

************* Module salt.output.nested
salt/output/nested.py:29: [W0611(unused-import), ] Unused import sys
Revert commit 1a90b5f.
Merge pull request #15858 from cvrebert/patch-1

salt.output.nested: rm unused import of sys module