Sweeping !22638 from 21.3 to 21.1. Cherry-pick fixes in trigger test exec scripts from master to 21.3
Cherry-pick fixes in trigger test exec scripts from master to 21.3
See merge request !22638 (merged)
Cherry-pick fixes in trigger test exec scripts from master to 21.3
See merge request !22638 (merged)