Manual sweep of !36853 from 21.0 to 21.3: Externals Update and CentOS 7 Fixes, 21.0 branch (2020.09.30.)

John Derek Chapmanrequested to merge
jchapman/athena:Sweep36853to21.3 into 21.3

Externals Update and CentOS 7 Fixes, 21.0 branch (2020.09.30.)

See merge request !36853 (merged)

Merge request reports