git state to update repo where rev = branch name
Fix typo
Merge pull request #7415 from terminalmage/docs

Fix typo
Adding file:// URL support for salt mako template lookup

Adding file:// URL support to lookup mako templates on local file
system...
If mako templates are already present on a local file system on a
minion, it can use file:// URL to lookup a local copy. This in addition
to salt:// url support that is already present, which fetches a copy
from a salt server.
Adding master side acl support for mine.get
Fixed error in ext_pillar() params

The minion_id param was not necessisary and was causing errors.
I also updated the docs to properly evaluate the yaml, and added
additional exception handling.
Merge branch 'develop' of github.com:saltstack/salt into bugfix/django_orm
faq.rst: fix typo
Merge pull request #7420 from cvrebert/patch-1

faq.rst: fix typo
Allow for roster_file option in master config
Add roster help message for more clarity
Add --roster-file option salt-ssh
Merge pull request #7418 from micahhausler/bugfix/django_orm

Fixed param error in django_orm ext_pillar
Merge pull request #7410 from boltronics/git_state_fixes

git state to update repo where rev = branch name
Merge pull request #7416 from mlister2006/develop

Replacing pull request #7178 with this. Adding file:// URL support for mako template and mine_get acl support (Issue#5467)
fix pylint error
Fix pylint issues in master.py
Don't fail if `salt._compat` cannot be imported. Refs #7426. Fixes #7425.