Merge r86398 into the old wfWaitForSlaves. Update core calls.