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.
12839: Install specified version of gem if another version is already installed
#12913 - Missing broadcast option for states/network -> modules/debian_ip
file.directory: fix cleaning directory symlinks

With a file.directory state, using the 'clean' directive, some symlinks
could not be removed, raising exception:
  OSError: Cannot call rmtree on a symbolic link

The reason is that valid symlinks for directories are returned
by 'os.walk' as directories.

This commit checks if directories are, in fact, symlinks, and treats them
as simple files.
Update 'doc/.tx/config' - Build #59

  http://cookingwithsalt.org/job/salt/job/transifex/59/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge pull request #12964 from s0undt3ch/hotfix/transifex-updates

Update 'doc/.tx/config' - Build #59