Multiple base directories handling for SaltCacheLoader
Update doc/ref/states/highstate.rst

Avoid any ambiguity about dots in IDs.
A little longer timeout.
Merge pull request #3252 from gotcha/patch-2

Documentation : Avoid any ambiguity about dots in IDs.
Merge branch 'fix-local-jinja-template-resolution' into develop