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
Added support for pyenv.
Added support for pyenv.
Updated pyenv documentation.
Resolved merge conflicts.
Removed the warning just for testing.
For some reason the install_pyenv state wasn't present.
Merge remote branch 'upstream/develop' into develop

Conflicts:
	debian/changelog
	debian/control
	salt/__init__.py
	salt/master.py
give the minion the ability to evaluate its master from a modules function upon start
fixed *.upstart and rules
fixed mode
Enable prereq and prereq_in in pydsl
Add registry argument to call to npm.install

In #13033, I removed this argument from the call to npm.list, it appears
it was mistakenly put there instead of npm.install. Removing the
argument triggered a lint failure:

https://github.com/saltstack/salt/issues/13065

This commit adds the argument to the call to npm.install, which should
allow the state to work as originally intended.
Fix rsync options (#13047)
states.postgres_extension: Fixed unit test patching (and renamed to PostgresExtensionTestCase for future tests)
Added unit tests for postgres_user.present