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
serializers fix
aggregation fix
use serializers in state.file
implements sls renderer
implement sls external pillar
implement merging strategy into pillar
Reimplemented 'latest_version()' to fix #12663 and make it more readable + better debug-able.
Initial commit of boto_elasticache execution module.
Fix traceback due to unavailable module

The class defined in this state references a module that is not
installed. This commit moves the class definition with the try/except
where the deps it requires are loaded.
Document the options not allowed in the
Document the options that should not be used in the tar_options
parameter. Let the command tar to fail if the user dosn't use the right
options like --file, -a, -x, etc.

It doesn't worth the effort to put a logic to detect forbidden options
in the module.

The current code of removing 'f' breaks long options that have 'f', like
--transform.
Added support for pyenv.
disable confusing [ERROR] printing on retcode!=0 where not relevant
Properly use try-finally for file handle management
Fix indentation of class