Merge pull request #14989 from brandentimm/fix-grains-filterby-doc

Fixed example usage in docstring for grains.filter_by
Merge pull request #14997 from rallytime/api_wheel_fix

Change self.wheelclient.w_funcs to self.wheelclient.functions
Merge pull request #14998 from cachedout/event_block

Do not use non_blocking mode on master event bus
Merge pull request #14999 from nshalman/fix-ssh-shim-esky

lack of ssh_py_shim.py breaks esky builds
Merge pull request #15004 from rallytime/ps_test_fix

Don't stacktrace with old versions of psutil on certain functions
Merge pull request #15005 from cachedout/auth_no_check

Optimize auth
Merge pull request #15007 from UtahDave/2014.7fixwinunicode

use unicode strings
remove comments regarding boto failure - relevant only to versions prior to 2.4.0 / release date prior to 15-May-2012
add tcp-dumper for visualzing salt-master network activity
fix missing brace
pylinting and cleanup
more linting
fix mail address
Don't document the state.event function aliases
Fix incorrect function name in event state module example
return only one url

needed for test=True where compare one URL with an array of URLs failed
Add integration test for logging out of the rest_cherrypy app
Don't process request data on logout for rest_cherrypy module

There is no request data when logging out so this was returning a 500
reponse.

Fixes #15015
doc: Fix a simple markup error in aptpkg
Merge pull request #15014 from mcalmer/fix-zypper-url-getter

return only one url