Merge branch 'trigConf' into 'master'

Bug in new Gaudi JO svc interaction with HLT JO svc

See merge request atlas/athena!35696

Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx

@@ -31,7 +31,8 @@ StatusCode TrigConf::JobOptionsSvc::initialize()
 
   //  m_optsvc = serviceLocator()->getOptsSvc();
   ATH_CHECK(m_optsvc.retrieve());
-  m_optsvc->set( this->name() + ".TYPE" , "NONE" );
+  SmartIF<IService> josvc = &*m_josvc;
+  m_optsvc->set( josvc->name() + ".TYPE" , "NONE" );
 
   
   if (m_sourceType == "FILE") {