Updates to get TRUTH derivations running

Zach Marshallrequested to merge
zmarshal/athena:master_TruthDerivationPatch into master

This updates the primary TRUTH derivation code to match what's in 21.2, so that they are running again in master

Merge request reports