Sweeping !20318 from 21.3 to master. Update art-include in TriggerTest
Manual sweep of !20318 (merged) from 21.3 to master. Resolved conflicts in:
Trigger/TrigValidation/TriggerTest/test/test_*_hi_v5_*.sh
which came up because the commit disabling these tests in master wasn't swept to 21.3. I kept them disabled in master.
Edited by Rafal Bielski