AthenaConfiguration: Fix confTool behaviour for old configurations.

Previously, when reading old configurations, confTool would merge
together the two dictionaries that were written.  This is needed
for proper handling of JobOptionsSvc; the properties we want to compare
are those from the second dictionary.  (The first dictionary
contains properties such as the search path which we want to ignore.)
This was changed when confTool was unified for the old and new
configurations.  Tweak it to get back to the previous behavior.

Control/AthenaConfiguration/share/confTool.py

@@ -123,9 +123,9 @@ def _loadSingleFile(fname, args):
                 conf = [to_json, props[0], props[1]]
 
             elif isinstance(cfg, collections.defaultdict):  # old configuration
+                cfg.update(pickle.load(input_file))
+                conf.append(pickle.load(input_file))
                 conf.append(cfg)
-                for _ in range(2):
-                    conf.append(pickle.load(input_file))
         print("... Read", len(conf), "items from python pickle file: ", fname)
 
     elif fname.endswith(".json"):