Pick correct XML, overwrite unnumbered xml

Javier Montejo Berlingenrequested to merge
jmontejo/athena:master_fixes into master
  • Same as in 21.3 the numbered and unnumbered xml are now identical
  • Match the correct xml for Physics_pp_v7_primaries, which was pointing to Physics_pp_v7
  • Fixes ATR-20155

Merge request reports