Cleanup some missed updates to orte_wait_cb as params have changed

Refs #4717