Additional fixes to Cloud docker image after ba87234f515
Additional fixes to Cloud docker image after ba87234f515

GlenRSmith/elasticsearch,GlenRSmith/elasticsearch,GlenRSmith/elasticsearch,GlenRSmith/elasticsearch,GlenRSmith/elasticsearch