Cherry-pick fixes in trigger test exec scripts from master to 21.3

Cherry-picking fixes to trigger test exec scripts applied in !22613 (merged) and !22636 (merged)

cc @hartj