Fixed #21151 -- Bad cleanup in schema M2M repoint test