local changes for HE
Merge remote branch 'upstream/develop' into develop

fixed config.py

Conflicts:
	salt/config.py
Merge remote branch 'upstream/develop' into develop
Merge remote branch 'upstream/develop' into develop
added minion_denied to pki-structure to easily find denied minions
Re-committing changes after fetching and rebasing.
Addressing issues/concerns in #11611
Add docstrings to gpg renderer functions
Clarify requirements for gpg renderer
Add python-gnupg to opt_requirements for gpg renderer tests
Add some unit tests for gpg renderer
Fix eauth docs.

Refs #12111
Eauth group fixing

We had an issue wherein we would not eval groups if a user match
was found. This attempts to better merge user and group permissions.

Refs #12111
Introducing eauth unit testing.

Typo
More pylint
Pylint and (hopefully) Jenkins test fix.
Hook the assertions into the event system.
added a describe_volumes function
First attempt at adding reinstall logic to pkg.install for yumpkg module
First attempt at adding reinstall logic to pkg.install for yumpkg module
Merge branch 'develop' into pkg.install-reinstall