Upgrade elasticsearch to v1.3.1

Fixes ZEN-12903

Create a second instance of elastic running v1.3.1 for use by logstash; upgrade logstash to v1.4.2

NOTE: This review will be easiest if done per commit; I can squash it after.