[skip modfiles] apply the same fix that worked for 501793 to other DSIDs

it is a fix for ATLMCPROD-8685, i.e. the fix that worked for 501793 athena running (!598 (merged)) is propagated to other DSIDs