Upgrade elasticsearch to v1.3.1

Create a second instance of elastic running v1.3.1 for use by logstash
Upgrade logstash to v1.4.2
Various upgrades to isvcs makefile and Dockerfile