[geard/f20] make integration tests more resilient

[Lokesh Mandvekar]

Summary of changes:

  d7a1691... make integration tests more resilient (*)

(*) This commit already existed in another branch; no separate mail sent