Merged changed from trunk: go and check for the OAI db to use without restarting, but only when the resumption token is not involved.
Merged changed from trunk: go and check for the OAI db to use without restarting, but only when the resumption token is not involved.