Fix test failure
Merge branch 'issue_17000' into develop_17000

Conflicts:
	salt/master.py
Making salt.utils.doc python3 compatible
Making salt.utils.files python3 compatible
Making salt.utils.jinja python3 compatible
Making salt.utils.raetevent python3 compatible
Removing all bad lists
Removing all bad lists
Reorganizing import
Reorganizing import
Fix pylint and matcher problems from merge forward
need initializer for ret incase no minions return
removed salt_call as a share destination. Now that salt-call with raet with standup minion
is owrking looks like don't need separate destination
Making salt.states.win_system python3 compatible
Fix another small error
Making salt/netapi/rest_cherrypy/__init__ python3 compatible
Making salt/netapi/rest_cherrypy/app python3 compatible
Making salt/netapi/rest_cherrypy/event_processor python3 compatible
Making salt/netapi/rest_cherrypy/wsgi python3 compatible
Making salt/netapi/rest_cherrypy/tools/websockets python3 compatible