Upgrade to Elasticsearch 1.2.1

Change-Id: I8bcdc7407ecf4f55b07e047f8342f6a0fdc84b78
Merge "Upgrade to Elasticsearch 1.2.1"