Actually reset OrderID

This fixes a bug where we would not be resetting the OrderID
after finalizing status. (We also want to keep the contribution
ID so remove that from the purge list.)

Change-Id: Ib7c8dc906278cc39ff6e222ed9f5e43801436e6d
Merge "Actually reset OrderID"