Elasticsearch 1.4.0 (with sonian http.type disabled)
Elasticsearch package/job cleanup...

 * drop HQ/marvel/jetty from pre-installed elasticsearch plugins
 * convert elasticsearch config from JSON to YAML
 * adding user-configurable elasticsearch.config_options, elasticsearch.logging_options  properties
Comment out restorer job in bosh-lite
Add elasticsearch.plugins property to support installing external plugins

    elasticsearch.plugins:
      - { "kopf" : "lmenezes/elasticsearch-kopf" }
      - { "HQ" : "https://github.com/royrusso/elasticsearch-HQ/zipball/master" }
      - { "marvel" : "elasticsearch/marvel/latest" }
Allow additional outputs
Updated release
Merge pull request #92 from rkoster/Additional-outputs

Allow additional outputs
Merge branch 'develop' into experiment-mt
Merge branch 'elasticsearch-1-4-0' into develop

Issue #91
Drop collectd job, collectd/python packages

Issue #86
Drop logstash_forwarder job, logstash-forwarder package

Issue #87
Formatting
Merge branch 'develop' into experiment-mt

Conflicts:
	jobs/elasticsearch/spec
	packages/elasticsearch/packaging
	packages/elasticsearch/spec
Merge branch 'experiment-mt' into multi-tenant-merge