Update conditions tag for run 2 tests. Add conditions tag folder override for run 1 tests. Fixes ATR-24925