This PS modifies Elasticsearch and Kibana configuration templates
so genconfig can genarate Kubernetes compatible config for these
services.

TrivialFix

Change-Id: I6886307a163a9ca27a29e6dbdac4f9080948e4b5