Fix `SyntaxError`, call `super` and properly call `super`.
Skip `unit.templates.jinja_test.TestGetTemplate.test_strftime` test if `timelib` is not installed.
Install `timelib` in the Travis-CI environment.
Only create `TMP` if it doesn't already exists (hint: `--no-clean`)
Simplify the Syndic configuration testing.

* Inherit the master configuration file on the syndic one.
* Recreate the Syndic on the test. Don't pass it as a module global.
Actually, the Syndic config test case can be a simple unit test.
added reconnect dealy for the minion zmq-pull socket
Fix caching of 0-byte files

For some reason there was a check to see that the destination for the
cached file exists before writing an empty file. This prevented a 0-byte
file from overwriting a previously non-empty file in the cachedir. This
commit removes that check for the cache file's existence, allowing it to
be overwritten.
add __func_alias__ for modules.smf.reload

************* Module salt.modules.smf
W0622:117,0:reload: Redefining built-in 'reload'
Merge pull request #6210 from hulu/smf-reload-func-alias

add __func_alias__ for modules.smf.reload
Merge pull request #6208 from terminalmage/issue6200

Fix caching of 0-byte files
Make sure nothing exists at jid path before creating dir, Fix #6203
Fix indents (how did this happen?)
Merge pull request #6215 from basepi/jidpath6203

Make sure nothing exists at jid path before creating dir, Fix #6203
Fix tmpfile cleanup for windows (itertools not supported), Fix #6209

Rather than continue the list comprehensions that have given trouble
previously, I just did it with an easy-to-follow nested loop.
Merge pull request #6216 from basepi/tmpfiles6209

Fix tmpfile cleanup for windows (itertools not supported), Fix #6209
Revert "Fix tmpfile cleanup for windows (itertools not supported), Fix #6209"

This reverts commit 03561b784003035e4b9d11e95a9e508460440b04.
Import itertools in win_file.py
Fix PEP8 stuff
Merge pull request #6217 from basepi/tmpfiles

Revert "fix" for windows itertools.  Just import itertools in win_file.py instead.