Track madx upstreaming and cherry-pick when ready

https://github.com/spack/spack/pull/28932