(#3477) Fix EC2 keypair cleanup.
(#3436) Fix concurrency problem in curl exposed by batching updates.