Merge branch 'cherry-pick-c6646656-21.9' into '21.9'

Sweeping !27452 from 21.2 to 21.9.
Configure AnaToolHandles from athena joboptions

See merge request atlas/athena!27680

Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc

@@ -526,7 +526,7 @@ namespace asg
 	  ANA_MSG_ERROR ("trying to initialize ToolHandleArray property " << val_name << " with empty handle");
 	  return StatusCode::FAILURE;
 	}
-      
+
 	//strip the parent name
 	std::string tool_name = toolHandle.name();
 	tools.push_back (toolHandle.type() + "/" + tool_name);
@@ -1130,6 +1130,9 @@ namespace asg
       return detail::AnaToolHandleMode::USER;
 #endif
 
+    if (m_config.empty() && !m_handleUser->typeAndName().empty() && (m_handleUser->type() != this->type() || m_handleUser->name() != this->name()))
+      return detail::AnaToolHandleMode::USER;
+
     if (m_config.empty() && m_name.empty())
       return detail::AnaToolHandleMode::EMPTY;