If we fail to reschedule from the waiting list, we ditch the entire waiting list in an attempt to recover.

This also fixes buglet in previous commit which failed to call
CNT_AcctLogCharge()

Fixes: #1629

(cherry picked from commit 9fbcb4e9)