Protect against EC2 failures due to delayed dependency graph updates in battery tests