s3fs: envs => environments, to avoid shadowing envs() func
Merge pull request #5655 from cvrebert/patch-2

s3fs: envs => environments, to avoid shadowing envs() func
auth.pam: avoid relying upon NameError
Merge pull request #5656 from cvrebert/patch-1

auth.pam: avoid relying upon NameError
Make winrepo package names work for pkg states

This adds a reverse name map to the repo data that is created by the
winrepo.genrepo runner, and removes some windows-specific code from the
pkg state since we no longer have to work around the fact that winrepo
packages are discovered with their full names.
Remove __context__ from get_repo_data

This is causing a traceback in the pkg state. Will have to figure out
how to fix this.
Add confirmation step for salt-key -a/-A

This implements #3495.
Remove trailing whitespace
Add example for ext_pillar in docs, Fix #5653
Catch and ignore CTRL_LOGOFF_EVENT when run as a windows service
Prioritize environmnt variable config location over default, Fix #5631
Prioritize `-c` over environment variable config
Merge pull request #5661 from basepi/extpillardocs

Add example for ext_pillar in docs, Fix #5653
Use default from DEFAULT_MASTER_OPTS instead of hard-coding
Merge pull request #5657 from terminalmage/issue5422

Make winrepo package names work for pkg states
Merge pull request #5660 from terminalmage/issue3495

Add confirmation step for salt-key -a/-A
Revert "Catch and ignore CTRL_LOGOFF_EVENT when run as a windows service"

This reverts commit a7ddf81b37b578b1448f83b0efb4f7116de0c3fb.
Put console event handle in reachable code
Fix import issues
Document the SLS file namespace