Fix #18131

The url password gathering was not fixed for requests
Fix for #8670

We should only update the wait timeout on mis-matched event if we had a timeout to begin with
Add regression test for #8670

Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
Remove 'repo' argument as it isn't used by function
Use sdecode in highstate
remove unused imports
Use the sdecode routine
Fix for cross-platform sysctl with test and custom config location when using systemd >= 207

When using a custom config path for sysctl states, it would fail with an IOError
as it was looking for the defaults which also may not exist as shown below:

----------
          ID: net.ipv4.tcp_keepalive_intvl
    Function: sysctl.present
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib/python2.7/site-packages/salt/state.py", line 1533, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.7/site-packages/salt/states/sysctl.py", line 56, in present
                  configured = __salt__['sysctl.show'](config_file=True)
                File "/usr/lib/python2.7/site-packages/salt/modules/linux_sysctl.py", line 86, in show
                  for line in salt.utils.fopen(config_file_path):
                File "/usr/lib/python2.7/site-packages/salt/utils/__init__.py", line 1065, in fopen
                  fhandle = open(*args, **kwargs)
              IOError: [Errno 2] No such file or directory: '/etc/sysctl.d/99-salt.conf'

The corresponding state had a config file specified that was ignored. But this would hold true for any
minion meeting the systemd conditions and not having 99-salt.conf. Now, for normal highstate runs, the current
and configured options are not run unless test is specified and if the configured check returns none, the
user will be notified that there was an issue reading the default/specified file.

Platforms other than linux also appeared to not have the config_file argument for show() that would have probably (I did not verify) bail out with argument number errors during normal runs.

Conflicts:
	salt/modules/netbsd_sysctl.py
	salt/modules/openbsd_sysctl.py
more lint
Switch ec2 driver to signature version 4
Add information about salt-cloud events to master events doc
Merge pull request #18376 from thatch45/18361

Add sdecode for highstate
Merge pull request #18343 from thatch45/requests_crazy

Fix #18131
Only run if it is a string, change in develop for six compat
avoid shadowing in returners.multi_returner
Fix unused args in modules/cloud.py

Fixes #18387
makefile update at Fri Nov 21 17:12:48 CST 2014
Merge pull request #18363 from jacksontj/2014.7

Fix for #8670
Merge pull request #18375 from rallytime/remove_unused_arg

Remove 'repo' argument as it isn't used by function
Merge pull request #18378 from rallytime/bp-18079

Backport #18105 to 2014.7