Merge branch 'master' of https://gitlab.cern.ch:8443/atlas/athena into use.Gaudi.FileCatalog

Control/AthenaBaseComps/src/AthCnvSvc.cxx

Database/RegistrationServices/src/IOVRegistrationSvc.cxx

...ditions/SCT_ConditionsAlgorithms/share/testLinkMasking.py

...nditions/SCT_ConditionsAlgorithms/share/testModuleVeto.py

...nditions/SCT_ConditionsAlgorithms/share/testParameters.py

...tConditions/SCT_ConditionsAlgorithms/share/testSensors.py

...onditions/SCT_ConditionsAlgorithms/share/testStripVeto.py

...nditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.cxx

...ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.h

...s/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingTestAlg.cxx

...ons/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingTestAlg.h

...ns/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoTestAlg.cxx

...ions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoTestAlg.h

...tions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx

...ditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.h

...ons/SCT_ConditionsAlgorithms/src/SCT_StripVetoTestAlg.cxx

...tions/SCT_ConditionsAlgorithms/src/SCT_StripVetoTestAlg.h

...ithms/src/components/SCT_ConditionsAlgorithms_entries.cxx

...etector/InDetConditions/SCT_ConditionsData/CMakeLists.txt

...ns/SCT_ConditionsServices/python/SCT_StripVetoSvcSetup.py