Merge branch 'cherry-pick-cf1fb970 [formerly b0877c6ff8]-21.0-mc16d' into '21.0-mc16d'

Sweeping !6354 from 21.2 to 21.0-mc16d.
Modification in Jet Physics Validation job option to update histogram content

See merge request atlas/athena!6832

Former-commit-id: e6b1a25e3ec54a66e8d34cf865276f45e5b0c1ef