[FIXED JENKINS-25570] Added waitUntil step.