diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
index b59d8a3bdb5c205d67e92e337f7d29efa05ea59b..0b296d3d1f0933d7e6393a1a2f9f7b1927261728 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
@@ -1,7 +1,7 @@
-Fri Apr 28 17:54:06 CEST 2017
+Mon Jun 19 01:26:36 CEST 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [mt-sss/1ba2d7dfb1] -- built on [2017-04-28T1627]
+Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/bdbd0047a2] -- built on [2017-06-18T1607]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
@@ -10,33 +10,28 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle1MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle1_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5295 configurables from 12 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 12 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -DMTest__xAODTestDecor: DataModelTestDataCommon.DataModelTestDataCommonConf - ['DataModelTestDataRead.DataModelTestDataReadConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5358 configurables from 29 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v28r2)
-                                          running on lxplus036.cern.ch on Fri Apr 28 17:54:39 2017
+                                          running on lxplus046.cern.ch on Mon Jun 19 01:26:54 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 2745 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 2843 CLIDRegistry entries for module ALL
 ChronoStatSvc                                      INFO  Number of skipped events for MemStat-1
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaHiveEventLoopMgr                             INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc                                         INFO  getRegistryEntries: read 6402 CLIDRegistry entries for module ALL
-ClassIDSvc                                         INFO  getRegistryEntries: read 57 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 6508 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 59 CLIDRegistry entries for module ALL
 SGInputLoader                                      INFO Will preload the following DataObjects:
 ThreadPoolSvc                                      INFO no thread init tools attached
 AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
@@ -54,24 +49,24 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
     o INPUT  ('EventInfo','McEventInfo')
     o OUTPUT ('DMTest::CVec','cvec')
   xAODTestWriteCInfo
-    o INPUT  ('EventInfo','McEventInfo')
     o INPUT  ('DMTest::CVec','cvec')
-    o OUTPUT ('SG::AuxElement','cinfo')
+    o INPUT  ('EventInfo','McEventInfo')
     o OUTPUT ('DMTest::C','cinfo')
+    o OUTPUT ('SG::AuxElement','cinfo')
   xAODTestWrite
       none
   xAODTestDecor
-    o INPUT  ('DMTest::CVec','cvec')
-    o INPUT  ('EventInfo','McEventInfo')
     o INPUT  ('DMTest::C','cinfo')
     o INPUT  ('DMTest::CVec','ctrig')
+    o INPUT  ('DMTest::CVec','cvec')
+    o INPUT  ('EventInfo','McEventInfo')
     o OUTPUT ('DMTest::C','cinfo.dInt1')
-    o OUTPUT ('SG::AuxElement','cinfo.dInt1')
-    o OUTPUT ('DMTest::CVec','cvec.dInt1')
     o OUTPUT ('DMTest::CVec','ctrig.dInt1')
+    o OUTPUT ('DMTest::CVec','cvec.dInt1')
+    o OUTPUT ('SG::AuxElement','cinfo.dInt1')
   xAODTestReadDecor
-    o INPUT  ('DMTest::CVec','cvec.dInt1')
     o INPUT  ('DMTest::C','cinfo.dInt1')
+    o INPUT  ('DMTest::CVec','cvec.dInt1')
   EndIncFiringAlg
       none
   IncidentProcAlg2
@@ -95,7 +90,7 @@ AthenaHiveEventLoopMgr                             INFO Starting loop on events
 EventPersistencySvc                                INFO Added successfully Conversion service:McCnvSvc
 AthenaHiveEventLoopMgr                             INFO   ===>>>  start of run 0    <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 104 CLIDRegistry entries for module ALL
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
 xAODTestReadDecor                       0   0      INFO cvec.dInt1: 401 402 403 404 405 406 407 408 409 410
 xAODTestReadDecor                       0   0      INFO cinfo.dInt1: 3000
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #0, run #0 on slot 0,  1 events processed so far  <<<===
@@ -175,7 +170,7 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  start processi
 xAODTestReadDecor                       19  0      INFO cvec.dInt1: 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1: 60000
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.459618
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.312666
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
 SGInputLoader                                      INFO Finalizing SGInputLoader...
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
index 50ab50c30d880c02f0f03386cac666430aa49a9e..546931d991c3f20bea8898f29d26d34fa4f9d764 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
@@ -1,7 +1,7 @@
-Fri Apr 28 18:56:18 CEST 2017
+Mon Jun 19 02:35:03 CEST 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [mt-sss/1ba2d7dfb1] -- built on [2017-04-28T1627]
+Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/bdbd0047a2] -- built on [2017-06-18T1607]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
@@ -10,27 +10,22 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle2MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle2_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5295 configurables from 12 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 12 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -DMTest__xAODTestDecor: DataModelTestDataCommon.DataModelTestDataCommonConf - ['DataModelTestDataRead.DataModelTestDataReadConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5358 configurables from 29 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v28r2)
-                                          running on lxplus036.cern.ch on Fri Apr 28 18:56:39 2017
+                                          running on lxplus046.cern.ch on Mon Jun 19 02:35:27 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 9530 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 9733 CLIDRegistry entries for module ALL
 ChronoStatSvc                                      INFO  Number of skipped events for MemStat-1
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
@@ -41,8 +36,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-04-27T2225/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus036.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-06-17T2251/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus046.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
@@ -53,7 +48,7 @@ EventSelector                                      INFO reinitialization...
 EventSelector                                      INFO EventSelection with query 
 RootCollection Info Opening Collection File xaoddata.root in mode: READ
 RootCollection Info File xaoddata.root opened
-Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 364F1848-B367-0F46-A13C-CB82CCF4829B
+Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 Domain[ROOT_All] Info                           xaoddata.root
 RootDatabase.open Info xaoddata.root File version:60806
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:xaoddata.root"
@@ -61,13 +56,13 @@ ImplicitCollection Info and a name "POOLContainer(DataHeader)"
 EventPersistencySvc                                INFO Added successfully Conversion service:AthenaPoolCnvSvc
 EventSelector                                      INFO Initializing EventSelector - package version EventSelectorAthenaPool-00-00-00
 EventSelector                                      INFO reinitialization...
-EventSelector                                      INFO EventSelection with query 
 RootCollection Info Opening Collection File xaoddata.root in mode: READ
+EventSelector                                      INFO EventSelection with query 
 RootCollection Info File xaoddata.root opened
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:xaoddata.root"
 ImplicitCollection Info and a name "POOLContainer(DataHeader)"
 AthenaPoolAddressProviderSvc                       INFO Initializing AthenaPoolAddressProviderSvc - package version EventSelectorAthenaPool-00-00-00
-ClassIDSvc                                         INFO  getRegistryEntries: read 1437 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 1487 CLIDRegistry entries for module ALL
 SGInputLoader                                      INFO Will preload the following DataObjects:
 ThreadPoolSvc                                      INFO no thread init tools attached
 AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
@@ -82,17 +77,17 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
   SGInputLoader
       none
   xAODTestReadDecor
-    o INPUT  ('DMTest::CVec','cvec.dInt1')
     o INPUT  ('DMTest::C','cinfo.dInt1')
+    o INPUT  ('DMTest::CVec','cvec.dInt1')
   EndIncFiringAlg
       none
   IncidentProcAlg2
       none
 AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
-   o ('DMTest::CVec','cvec.dInt1')    required by Algorithm: 
-       * xAODTestReadDecor
    o ('DMTest::C','cinfo.dInt1')    required by Algorithm: 
        * xAODTestReadDecor
+   o ('DMTest::CVec','cvec.dInt1')    required by Algorithm: 
+       * xAODTestReadDecor
 AvalancheSchedulerSvc                              INFO Concurrency level information:
 AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
 AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
@@ -100,12 +95,12 @@ HistogramPersistencySvc                         WARNING Histograms saving not re
 AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
 ApplicationMgr                                     INFO Application Manager Initialized successfully
 xaoddata.root Info Database being retired...
-Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 364F1848-B367-0F46-A13C-CB82CCF4829B
+Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 RootCollection Info Opening Collection File xaoddata.root in mode: READ
 RootCollection Info File xaoddata.root opened
 DbSession Info     Open     DbSession    
 Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 364F1848-B367-0F46-A13C-CB82CCF4829B
+Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 Domain[ROOT_All] Info                           xaoddata.root
 RootDatabase.open Info xaoddata.root File version:60806
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:xaoddata.root"
@@ -196,9 +191,9 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  start processi
 xAODTestReadDecor                       19  0      INFO cvec.dInt1: 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1: 60000
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.818389
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.901648
 xaoddata.root Info Database being retired...
-Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 364F1848-B367-0F46-A13C-CB82CCF4829B
+Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
 SGInputLoader                                      INFO Finalizing SGInputLoader...
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
index 5585f7f8427c9be7d606eecddba7088dbfba5861..c53bb8b1592b39ef8795c3d34e554e3bc83af122 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
@@ -1,7 +1,7 @@
-Fri Apr 28 17:23:35 CEST 2017
+Sun Jun 18 16:52:45 CEST 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-opt] [atlas-work3/1a8659c857] -- built on [2017-04-28T1634]
+Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/bdbd0047a2] -- built on [2017-06-18T1607]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
@@ -10,7 +10,7 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks1MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks1_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5294 configurables from 32 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5358 configurables from 29 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
@@ -18,14 +18,14 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v28r2)
-                                          running on lxplus065.cern.ch on Fri Apr 28 17:23:49 2017
+                                          running on lxplus046.cern.ch on Sun Jun 18 16:53:01 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 2745 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 2843 CLIDRegistry entries for module ALL
 ChronoStatSvc                                      INFO  Number of skipped events for MemStat-1
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
@@ -36,16 +36,16 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-04-27T2225/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus065.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-06-17T2251/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus046.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
 DbSession Info     Open     DbSession    
 Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc                                            INFO Re-initializing PoolSvc
-ClassIDSvc                                         INFO  getRegistryEntries: read 6804 CLIDRegistry entries for module ALL
-ClassIDSvc                                         INFO  getRegistryEntries: read 54 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 7038 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 59 CLIDRegistry entries for module ALL
 SGInputLoader                                      INFO Will preload the following DataObjects:
 ThreadPoolSvc                                      INFO no thread init tools attached
 AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
@@ -63,20 +63,20 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
     o INPUT  ('EventInfo','McEventInfo')
     o OUTPUT ('DMTest::CVec','cvec')
   xAODTestWriteCInfo
-    o INPUT  ('EventInfo','McEventInfo')
     o INPUT  ('DMTest::CVec','cvec')
-    o OUTPUT ('SG::AuxElement','cinfo')
+    o INPUT  ('EventInfo','McEventInfo')
     o OUTPUT ('DMTest::C','cinfo')
+    o OUTPUT ('SG::AuxElement','cinfo')
   xAODTestWriteSymlinks
     o INPUT  ('EventInfo','McEventInfo')
-    o OUTPUT ('DMTest::S2','S2')
     o OUTPUT ('DMTest::S1','S2')
+    o OUTPUT ('DMTest::S2','S2')
     o OUTPUT ('DMTest::S2','S2alias')
   xAODTestReadSymlink
-    o INPUT  ('SG::AuxElement','cinfo')
     o INPUT  ('DMTest::S1','S2')
     o INPUT  ('DMTest::S2','S2')
     o INPUT  ('DMTest::S2','S2alias')
+    o INPUT  ('SG::AuxElement','cinfo')
   EndIncFiringAlg
       none
   IncidentProcAlg2
@@ -98,7 +98,7 @@ AthenaHiveEventLoopMgr                             INFO Starting loop on events
 EventPersistencySvc                                INFO Added successfully Conversion service:McCnvSvc
 AthenaHiveEventLoopMgr                             INFO   ===>>>  start of run 0    <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 104 CLIDRegistry entries for module ALL
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
 xAODTestReadSymlink                     0   0      INFO C (as AuxElement): 1000; S 0
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #0, run #0 on slot 0,  1 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  start processing event #1, run #0 on slot 0,  1 events processed so far  <<<===
@@ -158,7 +158,7 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  done processin
 AthenaHiveEventLoopMgr                             INFO   ===>>>  start processing event #19, run #0 on slot 0,  19 events processed so far  <<<===
 xAODTestReadSymlink                     19  0      INFO C (as AuxElement): 20000; S 1900
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.0529721
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.170525
 Domain[ROOT_All] Info >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
index a45d5e48d39c0dbee051cf0979e9e8fca4440292..29a7add8d79d794c33a6251a5a6283f55c804ef8 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
@@ -1,7 +1,7 @@
-Fri Apr 28 17:28:56 CEST 2017
+Mon Jun 19 01:36:00 CEST 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-opt] [atlas-work3/1a8659c857] -- built on [2017-04-28T1634]
+Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/bdbd0047a2] -- built on [2017-06-18T1607]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
@@ -10,7 +10,7 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks2MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks2_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5294 configurables from 32 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5358 configurables from 29 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
@@ -18,14 +18,14 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v28r2)
-                                          running on lxplus065.cern.ch on Fri Apr 28 17:29:11 2017
+                                          running on lxplus046.cern.ch on Mon Jun 19 01:36:25 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 9475 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 9733 CLIDRegistry entries for module ALL
 ChronoStatSvc                                      INFO  Number of skipped events for MemStat-1
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
@@ -36,8 +36,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-04-27T2225/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus065.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-06-17T2251/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus046.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
@@ -48,21 +48,21 @@ EventSelector                                      INFO reinitialization...
 EventSelector                                      INFO EventSelection with query 
 RootCollection Info Opening Collection File xaoddata.root in mode: READ
 RootCollection Info File xaoddata.root opened
-Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] F17F7D8B-D9E3-3B47-937B-8EF603737134
+Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 Domain[ROOT_All] Info                           xaoddata.root
 RootDatabase.open Info xaoddata.root File version:60806
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:xaoddata.root"
 ImplicitCollection Info and a name "POOLContainer(DataHeader)"
 EventPersistencySvc                                INFO Added successfully Conversion service:AthenaPoolCnvSvc
 EventSelector                                      INFO Initializing EventSelector - package version EventSelectorAthenaPool-00-00-00
-EventSelector                                      INFO reinitialization...
-EventSelector                                      INFO EventSelection with query 
 RootCollection Info Opening Collection File xaoddata.root in mode: READ
 RootCollection Info File xaoddata.root opened
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:xaoddata.root"
 ImplicitCollection Info and a name "POOLContainer(DataHeader)"
+EventSelector                                      INFO reinitialization...
+EventSelector                                      INFO EventSelection with query 
 AthenaPoolAddressProviderSvc                       INFO Initializing AthenaPoolAddressProviderSvc - package version EventSelectorAthenaPool-00-00-00
-ClassIDSvc                                         INFO  getRegistryEntries: read 1434 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 1487 CLIDRegistry entries for module ALL
 SGInputLoader                                      INFO Will preload the following DataObjects:
 ThreadPoolSvc                                      INFO no thread init tools attached
 AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
@@ -77,23 +77,23 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
   SGInputLoader
       none
   xAODTestReadSymlink
-    o INPUT  ('SG::AuxElement','cinfo')
     o INPUT  ('DMTest::S1','S2')
     o INPUT  ('DMTest::S2','S2')
     o INPUT  ('DMTest::S2','S2alias')
+    o INPUT  ('SG::AuxElement','cinfo')
   EndIncFiringAlg
       none
   IncidentProcAlg2
       none
 AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
-   o ('SG::AuxElement','cinfo')    required by Algorithm: 
-       * xAODTestReadSymlink
    o ('DMTest::S1','S2')    required by Algorithm: 
        * xAODTestReadSymlink
    o ('DMTest::S2','S2')    required by Algorithm: 
        * xAODTestReadSymlink
    o ('DMTest::S2','S2alias')    required by Algorithm: 
        * xAODTestReadSymlink
+   o ('SG::AuxElement','cinfo')    required by Algorithm: 
+       * xAODTestReadSymlink
 AvalancheSchedulerSvc                              INFO Concurrency level information:
 AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
 AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
@@ -101,12 +101,12 @@ HistogramPersistencySvc                         WARNING Histograms saving not re
 AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
 ApplicationMgr                                     INFO Application Manager Initialized successfully
 xaoddata.root Info Database being retired...
-Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] F17F7D8B-D9E3-3B47-937B-8EF603737134
+Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 RootCollection Info Opening Collection File xaoddata.root in mode: READ
 RootCollection Info File xaoddata.root opened
 DbSession Info     Open     DbSession    
 Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] F17F7D8B-D9E3-3B47-937B-8EF603737134
+Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 Domain[ROOT_All] Info                           xaoddata.root
 RootDatabase.open Info xaoddata.root File version:60806
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:xaoddata.root"
@@ -177,9 +177,9 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  done processin
 AthenaHiveEventLoopMgr                             INFO   ===>>>  start processing event #19, run #0 on slot 0,  19 events processed so far  <<<===
 xAODTestReadSymlink                     19  0      INFO C (as AuxElement): 20000; S 1900
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.268071
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.405513
 xaoddata.root Info Database being retired...
-Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] F17F7D8B-D9E3-3B47-937B-8EF603737134
+Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 11967957-B400-5A4C-A704-29F42FDA6D2C
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
 SGInputLoader                                      INFO Finalizing SGInputLoader...
@@ -187,8 +187,8 @@ IncidentProcAlg2                                   INFO Finalize
 AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 AvalancheSchedulerSvc                   19  0      INFO Terminating thread-pool resources
 TimelineSvc                                        INFO Outputting timeline with 120 entries to file  'TimelineFile':timeline.csv
-Domain[ROOT_All] Info >   Deaccess DbDomain     READ      [ROOT_All] 
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
+Domain[ROOT_All] Info >   Deaccess DbDomain     READ      [ROOT_All] 
 AthDictLoaderSvc                                   INFO in finalize...
 ToolSvc                                            INFO Removing all tools created by ToolSvc
 ChronoStatSvc.finalize()                           INFO  Service finalized successfully