John Derek Chapman authored Dec 11, 2018 and Mark Hodgkinson committed Dec 12, 2018

Merge branch 'cherry-pick-b4bc84a8 [formerly 639e136414]-21.3' into '21.3'

Sweeping !16382 from 21.0 to 21.3.
Update PFO EDM enum

See merge request atlas/athena!16545


Former-commit-id: a7538ad7f44545ad64ea9a42aa104870aae34fd4