Merge "rdbms: undeprecate DBReplicationWaitError to align with current use"