Fix matching of merged NSW PRD to SDO See merge request atlas/athena!15867 (cherry picked from commit 3269ee6e [formerly f2b9c8e274abbaf910d3bd4aa0339d4d1b934206]) 67741986 Fix matching of merged NSW PRD to SDO Former-commit-id: 9bf4068d