ElasticSearch to 1.1 branch

Change-Id: I1c7cd1dc1017e8fa482d81300a0046d0e62c64a3
Merge "ElasticSearch to 1.1 branch"