Data collector does not separate CREAM jobs from ES ones anymore
Removed old WaitTimeEstimator