Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev