Merge branch 'cherry-pick-3dc24510a9-master' into 'master'

Sweeping !4442 from 21.0 to master.
Update exec_athena_art_trigger_validation.sh to send athena output to the grid log

See merge request !4597