Merge remote-tracking branch 'upstream/master' into create-hlt-result

AtlasTest/ControlTest/CMakeLists.txt

AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref

AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref

AtlasTest/ControlTest/share/test_cfgItemList.ref

AtlasTest/ControlTest/share/test_keyStore.ref

AtlasTest/ControlTest/test/TestControl.xml

AtlasTest/ControlTest/test/test_cfgItemList.sh

AtlasTest/ControlTest/test/test_keyStore.sh

Control/AthenaCommon/python/AppMgr.py

Control/AthenaCommon/share/AthAppMgrUnitTests.ref

Control/AthenaCommon/test/AthAppMgrUnitTests.py

Control/AthenaMP/python/PyComps.py

Control/AthenaServices/CMakeLists.txt

Control/AthenaServices/share/AthDictLoaderSvc.ref

Control/AthenaServices/share/SimplePOSIXTimeKeeperSvc.ref

...rol/AthenaServices/share/SimplePOSIXTimeKeeperSvc_test.py

Control/AthenaServices/src/AthenaEventLoopMgr.cxx

Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx

Control/AthenaServices/test/AthDictLoaderSvc.sh

Control/AthenaServices/test/AthenaServices.xml