Add optional message param to wait_until utility method.