Merge pull request #18324 from llamallama/2014.7

Bug fix. _grant_to_tokens not constructing full table name.
Merge pull request #18301 from jacksontj/2014.7-config

Pass timeout for pub() down to channel
Use the `skip_if_binaries_missing_helper`
Make salt.fileclient Python3 compatible
Use `urlparse` from six
Use `urlparse` from six
Use `urljoin` from six
Use `urlparse` from six
Use `urljoin` from six
Use `shlex_quote` from six
Use `shlex_quote` from six
Use `shlex_quote` from six
Use `shlex_quote` from six
Use `shlex_quote` from six
Use `shlex_quote`, `urlparse` from six. Double to single quotes
PyLint disabled where appropriate
Rename urlparse to _urlparse
Use `urljoin` from six
Use `urljoin` from six
Use `urlencode` and `urlparse` from six