Added elasticsearch_jetty setup final
"update for conflict
"
Merge branch 'master' of https://github.com/Dhpandey/githup