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.
Added support for pyenv.
Optimize sync_all

This commit stores the environments read by reading the top file in
__context__ so that the top file does not need to be read once for each
sync doing in salt.modules.saltutil.sync_all().
Sync custom types before executing highstate
Modified skip flag logic to skip instead of filter.
Defaulted skipPresent to false, since it causes legitimate patches to be missed.
Fixed output of install_updates.
Fixed misc. code problems.
Avoid UnboundLocalError when there is no top file
Working salt-ssh test runner

This rounds out initial (alpha) support for a salt-ssh test runner.

At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.

Conflicts:
	tests/integration/__init__.py
	tests/integration/files/conf/_ssh/sshd_config
	tests/integration/files/conf/sshd_config
	tests/integration/files/ext-conf/sshd_config
Generate server keys too