MySQL Module: Small fixs and debug on _grant_to_tokens
MySQL Module: fix on grants removal
Fix white-space lint issues
Fix the SSH password regular expression.
Make the regex work in Python 2.6
Merge pull request #9137 from ranl/fix_win_deploy_minion_conf

fix windows deploy minion configuration
Merge pull request #9106 from ranl/windows_deploy_script

salt-cloud: ec2 cloud provider fix issue of windows minion deployment
Fix white-space related issues, and anomalous backslash.
Don't send timestamps in UTC

Logstash by itself takes care of conversion of timestamps to UTC, with how it was logstash was showing wrong time for the events.
Fix reporting of file.blockreplace state when test=True

When test=True is used, this state does a dry run and doesn't change the
file (as expected), but reports that changes were made. This commit
fixes the reporting so that it states that changes would have been made.
Initial stab at a development salt shell

There is quite a bit of additional work that could be done here but this
gets things rolling at least.

Refs #3814
new external_ip grain for salt - requires that requests be installed
Merge pull request #9143 from whiteinge/salt-shell

Initial stab at a development salt shell
Merge pull request #9142 from terminalmage/quickfix

Fix reporting of file.blockreplace state when test=True
Prevent traceback when job is None.
Merge pull request #9145 from cro/develop

Prevent traceback when job is None.
move external_ip to separate file
return empty dict instead of False if requests fails to import
Merge pull request #9144 from jfrost/external_ip_grain

new external_ip grain for salt - requires that requests be installed
Whopps! Needs to be an empty dict :)
Added missing definitions for networking setting, add and get.  Changed interface parsing to use a dictionary for inet and inet6 interfaces instead of an array.  Certain assumptions were made within the code on the order the ipv4 & ipv6 interfaces would appear, using a dictionary instead resolves some potential issues that could have popped up with an array.  removing the tests for ip.get_network_settings and ip.build_network_settings from the exclusion.