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
First attempt at adding reinstall logic to pkg.install for yumpkg module
First attempt at adding reinstall logic to pkg.install for yumpkg module
Merge branch 'develop' into pkg.install-reinstall
First attempt at adding reinstall logic to pkg.install for yumpkg module
states.iptables support custom rule filename to save
Added _in_pkg_dict() helper function to enable reinstall functionality for versioned package names and for sources.  Also fixed return data for reinstall of versioned package name.
Fixed pylint violations
Fixed potential unbalanced tuple unpacking
elasticsearch returner.

Dependencies:

- official elasticsearch python client
- jsonpickler.

configuration is defined in the master config file:

```yaml
ext_job_cahe: elasticsearch

elasticsearch:
    host: 'some.host.com:9200'
    index: 'salt'
    number_of_shards: 1 (optional)
    number_of_replicas: 3 (optional)
```