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.
Update to tomcat.py

-Added "force" (default false) option commensurate with force option in salt.modules.tomcat.deploy_war to allow forced deployment of a .war even if the version strings match.  
-Forced successful deploy comment to be a string instead of dict to compensate for https://github.com/saltstack/salt/issues/12840
Update tomcat.py
Initial commit of boto_elasticache execution module.
Merge pull request #12940 from terminalmage/docs

Add gitfs_provider documentation
Fix incorrect reference to module

This fixes breakage introduced in 60cf38f6.
Merge pull request #12941 from terminalmage/fix-shadow

Fix incorrect reference to module
Use minion ID, not fqdn
Merge pull request #12942 from jacksontj/concurrency_control

Use minion ID, not fqdn