Merge branch 'develop' of https://github.com/saltstack/salt into develop
Multiple base directories handling for SaltCacheLoader
Fix not intended name shadowing
Merge remote-tracking branch 'origin/develop' into fix-local-jinja-template-resolution
Fixed jinja_tests.
File roots contains lists of paths for each env.
Merge remote-tracking branch 'upstream/develop' into fix-local-jinja-template-resolution
Show why git describe failed on the tests.
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge pull request #3274 from UtahDave/develop

Fixes #3272  Ensure nodetool and cassandra
Salt needs it's complete git history in the Travis-CI checkout.
grain fix for SUSE Enterprise Server
Merge pull request #3276 from archtaku/issue3275

grain fix for SUSE Enterprise Server
Add `git://github.com/saltstack/salt.git` as a remote and fetch tags upstream for forks.
Simplify logic of getting the temporary directory.
Simplify sub-classing `Master`, `Minion` and `Syndic` + PEP-8.

* Since we no longer suffer from too early logger initiation, replace any `logging.getLogger(__name__)` calls with an initial defined `logger`(not `log` so it does not clash with `salt.log`.
Comply with the convention and still provide the ability to subclass masters and minions.
The syndic also `start()`'s it does not `run()`.
Merge pull request #3257 from mjarco/fix-local-jinja-template-resolution

Fix jinja template includes lookup with salt-call --local mode
Merge pull request #3253 from s0undt3ch/features/minion-subclass

Simplify sub-classing `Master`, `Minion` and `Syndic` + PEP-8.
Remove deprecated configuration options. Fixes 3271.