Fixing ES cleanup and positive dataset host string

Change-Id: I4cf72e96624b5c67701594baa955c421b6396859
Merge "Fixing ES cleanup and positive dataset host string"