Sweeping !25041 (merged) from 21.2 to 21.0. Bugfix in TrkVertexFitters
See merge request !25066 (merged)