reindent
Avoid wait time when stopping container

Instead of wait a predetermined number of seconds, watch and
wait for Elasticsearch server process to terminate.

This considerably speeds up the stop procedure.
Update Elasticsearch to latest 1.3.x