Merge "rdbms: add more ScopedCallback::newScopedIgnoreUserAbort() calls"