diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index 46e7228164ef546e9f1ec64c04f84a98cbe0c7d5..ce8cb891584a680189ecfcd76b0d71beb2e6a05b 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -12,8 +12,10 @@ atlas_depends_on_subdirs( PRIVATE
# Install files from the package:
atlas_install_headers( AthenaCommon )
atlas_install_python_modules( python/*.py python/Utils )
-atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py )
+atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
+ share/zeroJO.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py)
atlas_install_scripts( share/athena.py share/athena_preload.sh share/chappy.py share/find_cfg_dups.py share/test_cfg_pickling.py )
+atlas_install_runtime(share/*.pkl)
# Aliases:
atlas_add_alias( athena "athena.py" )
@@ -31,6 +33,12 @@ atlas_add_test( KeyStoreUnitTests SCRIPT test/test_KeyStoreUnitTests.sh
atlas_add_test( CFElementsTest SCRIPT python -m unittest -v AthenaCommon.CFElements
POST_EXEC_SCRIPT nopost.sh )
+atlas_add_test( GenerateBootstrapTest
+ SCRIPT test/test_gen_bootstrap.sh
+ #ignore location of bootstrap file and whether it was already downloaded
+ EXTRA_PATTERNS ".*copy bootstrap.*pkl|.*\/share\/bootstrap.*pkl|File.*exists in the current directory|^Willing to acquire"
+ )
+
# Check python syntax:
atlas_add_test( flake8
SCRIPT flake8 --select=F,E101,E112,E113,E7,E9,W6 --ignore=E701,E741 ${CMAKE_CURRENT_SOURCE_DIR}/python
diff --git a/Control/AthenaConfiguration/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
similarity index 100%
rename from Control/AthenaConfiguration/share/GenerateBootstrapTest.ref
rename to Control/AthenaCommon/share/GenerateBootstrapTest.ref
diff --git a/Control/AthenaConfiguration/python/bootstrap.pkl b/Control/AthenaCommon/share/bootstrap.pkl
similarity index 95%
rename from Control/AthenaConfiguration/python/bootstrap.pkl
rename to Control/AthenaCommon/share/bootstrap.pkl
index b44cc47be44a0793473ae2eb10f77bc74b4dd7f2..4dad90511ccdac190b18fdf3733412da7261292a 100644
--- a/Control/AthenaConfiguration/python/bootstrap.pkl
+++ b/Control/AthenaCommon/share/bootstrap.pkl
@@ -185,7 +185,7 @@ S'[]'
p97
sS'Members'
p98
-S"['AthSequencer/AthAlgEvtSeq', 'AthSequencer/AthOutSeq']"
+S"['AthSequencer/AthAlgEvtSeq']"
p99
sS'NeededResources'
p100
@@ -220,7 +220,7 @@ S'True'
p115
sS'Members'
p116
-S"['AthSequencer/AthFilterSeq', 'AthSequencer/AthRegSeq']"
+S"['AthSequencer/AthFilterSeq', 'AthSequencer/AthOutSeq', 'AthSequencer/AthRegSeq']"
p117
sS'NeededResources'
p118
@@ -797,7 +797,7 @@ p112
g7
sS'SEARCHPATH'
p113
-S'.:/afs/cern.ch/work/s/smh/idconfig_2/bld/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-11T2137/GAUDI/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/afs/cern.ch/work/s/smh/idconfig_2/bld:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-11T2137/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-11T2137/AthenaExternals/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions'
+S'.:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-20T2138/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-20T2138/AthenaExternals/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-20T2138/GAUDI/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions'
p114
sS'AuditInitialize'
p115
diff --git a/Control/AthenaConfiguration/python/bootstrap_threaded.pkl b/Control/AthenaCommon/share/bootstrap_threaded.pkl
similarity index 96%
rename from Control/AthenaConfiguration/python/bootstrap_threaded.pkl
rename to Control/AthenaCommon/share/bootstrap_threaded.pkl
index 6ad9193f79cdd31ed3e5ab8b353dd7bd70cda2fa..8c0a42c81d0acdd45c5318ce11d32a2c3d3d5ba9 100644
--- a/Control/AthenaConfiguration/python/bootstrap_threaded.pkl
+++ b/Control/AthenaCommon/share/bootstrap_threaded.pkl
@@ -276,7 +276,7 @@ S'[]'
p143
sS'Members'
p144
-S"['AthSequencer/AthAlgEvtSeq', 'AthSequencer/AthOutSeq']"
+S"['AthSequencer/AthAlgEvtSeq']"
p145
sS'NeededResources'
p146
@@ -311,7 +311,7 @@ S'True'
p161
sS'Members'
p162
-S"['AthSequencer/AthFilterSeq', 'AthSequencer/AthRegSeq']"
+S"['AthSequencer/AthFilterSeq', 'AthSequencer/AthOutSeq', 'AthSequencer/AthRegSeq']"
p163
sS'NeededResources'
p164
@@ -902,7 +902,7 @@ p105
g7
sS'SEARCHPATH'
p106
-S'.:/afs/cern.ch/work/s/smh/idconfig_2/bld/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-11T2137/GAUDI/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/afs/cern.ch/work/s/smh/idconfig_2/bld:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-11T2137/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-11T2137/AthenaExternals/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions'
+S'.:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-20T2138/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-20T2138/AthenaExternals/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-20T2138/GAUDI/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/jobOptions'
p107
sS'AuditInitialize'
p108
diff --git a/Control/AthenaConfiguration/share/zeroJO.py b/Control/AthenaCommon/share/zeroJO.py
similarity index 100%
rename from Control/AthenaConfiguration/share/zeroJO.py
rename to Control/AthenaCommon/share/zeroJO.py
diff --git a/Control/AthenaConfiguration/test/test_gen_bootstrap.sh b/Control/AthenaCommon/test/test_gen_bootstrap.sh
similarity index 79%
rename from Control/AthenaConfiguration/test/test_gen_bootstrap.sh
rename to Control/AthenaCommon/test/test_gen_bootstrap.sh
index 4a8b78d5f66212bb2ff03efea975ebd649d5d13b..3f39ccdde32c35509e7fcfa16bce092a83ed91c9 100755
--- a/Control/AthenaConfiguration/test/test_gen_bootstrap.sh
+++ b/Control/AthenaCommon/test/test_gen_bootstrap.sh
@@ -2,9 +2,9 @@
#Generate threaded and serial bootstrap pickles and diff them
#If there's a major change in AthenaCommon or Gaudi it will get picked up here
rm -f bootstrap*pkl
-athena --config-only=bootstrap_test.pkl AthenaConfiguration/zeroJO.py &> /dev/null
+athena --config-only=bootstrap_test.pkl AthenaCommon/zeroJO.py &> /dev/null
get_files -remove -data bootstrap.pkl
confTool.py --diff bootstrap.pkl bootstrap_test.pkl | grep -v identical
-athena --threads=1 --config-only=bootstrap_threaded_test.pkl AthenaConfiguration/zeroJO.py &> /dev/null
+athena --threads=1 --config-only=bootstrap_threaded_test.pkl AthenaCommon/zeroJO.py &> /dev/null
get_files -remove -data bootstrap_threaded.pkl
confTool.py --diff bootstrap_threaded.pkl bootstrap_threaded_test.pkl | grep -v identical
diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt
index 3ce9208d39b22e5bb65c6dcda8df3ba7e1bed3a5..9f1ab05d497938c6a9f6c6c4f9ad97ec76fd7aea 100644
--- a/Control/AthenaConfiguration/CMakeLists.txt
+++ b/Control/AthenaConfiguration/CMakeLists.txt
@@ -10,9 +10,7 @@ atlas_subdir( AthenaConfiguration )
# Install files from the package:
atlas_install_python_modules( python/*.py python/iconfTool )
-atlas_install_runtime(python/*.pkl )
atlas_install_scripts( share/confTool.py python/iconfTool/iconfTool )
-atlas_install_joboptions( share/zeroJO.py )
atlas_install_data( share/*.ref )
atlas_add_test( ComponentAccumulatorTest
@@ -27,12 +25,6 @@ atlas_add_test( AthConfigFlagsTest
SCRIPT python -m unittest AthenaConfiguration.AthConfigFlags
POST_EXEC_SCRIPT nopost.sh )
-atlas_add_test( GenerateBootstrapTest
- SCRIPT test/test_gen_bootstrap.sh
- #ignore location of bootstrap file and whether it was already downloaded
- EXTRA_PATTERNS ".*copy bootstrap.*pkl|.*\/share\/bootstrap.*pkl|File.*exists in the current directory|^Willing to acquire"
- )
-
if( NOT "${CMAKE_PROJECT_NAME}" STREQUAL "AthSimulation" )
atlas_add_test( AllConfigFlagsTest
SCRIPT python -m AthenaConfiguration.AllConfigFlags