Letting the condor spin up before testing includes #4322
Merge branch 'V8_2-branch'