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
Import `salt.log` ASAP.

Because we NEED to make sure that any logger instance salt instantiates is using `salt.log.SaltLoggingClass`
Complement the docstring.
Remove `traceback.format_exc()` calls where not needed.
Fix for the regression pkgrepo.managed for the PPA
adding timeout option and fixing output of a failed state
Merge pull request #4539 from ranl/develop

adding timeout option and fixing output of a failed state
Merge pull request #4538 from yml/regression_pkgrepo_managed_ppa

Fix for the regression pkgrepo.managed for the PPA
Clean up makedirs wrt recent updates and fixes
Merge pull request #4535 from s0undt3ch/develop

Minor fixes
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
Include the filesystem cleanup options group into the parser.
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.