clean up ECS before reusing clients

Evan Hunt requested to merge 881-cleanup-ecs-v9_14 into v9_14

Merge request reports