Merge branch '21.0-mc16d-add-trklinks' into '21.0-mc16d'

MR !6372 fixes trklinks problem, so adding back trklinks metadata

See merge request !6399

Former-commit-id: 99cac7a7e1ef61c9d8ce5e1748fed9a13757e073

Reconstruction/RecoFix/python/RecoFix_r210.py

@@ -13,6 +13,6 @@ class RecoFix_r210(RecoFix_base):
 
     @staticmethod
     def latestAODFixVersion():
-        """The latest version of the AODFix. Use same sort as in AODFix"""
-        return ["IDTide", "egammaStrips"]
+        """The latest version of the AODFix. Use same sort order as in AODFix"""
+        return ["IDTide", "egammaStrips", "trklinks"]