Merge " ECS, deleting jobs when the type is deleted"