fixes ZEN-13443: change the service read from file to have desired state of stopped
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
Merge pull request #844 from control-center/feature/ZEN-13443

fixes ZEN-13443: change the service read from file to have desired state...
Merge pull request #845 from control-center/feature/elasticUpgrade

Upgrade elasticsearch to v1.3.1
Merge branch 'v5.0.0b2' into develop