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
Merge pull request #3257 from mjarco/fix-local-jinja-template-resolution

Fix jinja template includes lookup with salt-call --local mode