clean up ECS before reusing clients

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

Closes #881

Merge request reports