Changes for ElasticSearch needed by TTMServer

Change-Id: Iceac4bd220577e0111b5e4a5b28204ad0e3e2f33
Merge "Changes for ElasticSearch needed by TTMServer"