Merge commit 'f20fb955' into HEAD

GaudiExamples/src/AlgTools/MyServiceWithTool.cpp

 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,6 +22,7 @@ namespace GaudiTesting {
 
   private:
     PublicToolHandle<IMyTool> m_tool{this, "MyTool", "MyTool"};
+    ToolHandle<IMyTool> m_privTool{this, "MyPrivateTool", ""};
   };
 
   DECLARE_COMPONENT( SvcWithTool )

GaudiKernel/python/GaudiKernel/Configurable.py

 #####################################################################################
-# (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations #
+# (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations #
 #                                                                                   #
 # This software is distributed under the terms of the Apache version 2 licence,     #
 # copied verbatim in the file "LICENSE".                                            #
@@ -1161,7 +1161,11 @@ class ConfigurableService(Configurable):
         return self  # services are always shared
 
     def copyChild(self, child):
-        return child  # full sharing
+        # Copy private tools but all else is shared
+        if isinstance(child, ConfigurableAlgTool) and not child.isPublic():
+            return copy.deepcopy(child)
+        else:
+            return child
 
     def getHandle(self):
         return iService(self._name)