Add Elasticsearch cleanup job and minor improvements

Change-Id: If7f1e47721fa5e60464bb0d8a95a2ce1731428f1