elasticsearch to master again

Change-Id: Id169750c3560217b3879018fb3fe4ec4db080540