delete `salt`. the sql statements, because "conn" is  already specified
in "_get_serv" function. If specify it again, the mysql.db in
config.option is not efficacious
Don;t check for dig in each function, if dig is not there, don't load
Whoops :) return False, not None!
Update ubuntu.rst

The `software-properties-common` package is required to be able to do `add-apt-repository` and not the mentioned `python-software-properties`.
Merge pull request #4545 from syphernl/patch-1

Update ubuntu.rst
Merge pull request #4506 from pengyao/develop

delete `salt`. the sql statements
Add user wildcard matching for external auth
Merge pull request #4547 from sfdc-kho/develop

Add user wildcard matching for external auth
Merge pull request #4548 from s0undt3ch/develop

Include the filesystem cleanup options group into the parser.
Fix for #4514

Cleaning up warning/error messages for issue #4514.  There are now
log messages when either aptsources.sourceslist or
softwareproperties.ppa fail to import.  There are also clearer
log warnings when trying to use functions from either.
Allow for the main session key to be updated hot
Add dropfile function to utils
Move to salt.crypt
Fix #4520

Call for a refresh on the publish session key when removing keys
and rejecting keys forcing rejected minions to re-auth
Pass in the cachedir to dropfile
Doh! Default the mtime to an integer
Rotate the publish crypt session daily
Formatting Fix for #4514

Formatting fix on warning message(s) when python-software-properties
is unavailable.
Fix ssh-auth.absent to search for just the key; Fixes #4170

Previously was searching for the whole line, and ssh.rm_auth_key and
ssh.check_key were both expecting just the key part.
Set result=None not return=None for test=True