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
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
Added documentation on how to use master: module.function and master_type.
Merge pull request #13039 from felskrone/master_from_module

Master from module