spork nd tests
issue #22394: account for cases where relations are defined in orm extensions
Merge branch '22394' into 22394-merge
Merge branch 'ndtest' into 22394-merge
fix nondeterminism of return