Merge remote-tracking branch 'upstream/master' into re-integrate-re-running

Calorimeter/CaloRec/python/CaloCellGetter.py

Control/AthViews/test/ViewCollectionMerge_test.txt

...l/AthenaExamples/AthAsgExUnittest/test/gt_MockxAODJet.cxx

Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx

Control/AthenaServices/src/AthenaOutputStreamTool.cxx

...scription/GeoModel/GeoModelKernel/src/GeoVFullPhysVol.cxx

...rlay/EventOverlayJobTransforms/scripts/OverlayChain_tf.py

Event/xAOD/xAODBase/xAODBase/IParticle.h

Event/xAOD/xAODCaloEvent/CMakeLists.txt

Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx

Event/xAOD/xAODCaloEvent/Root/CaloTower_v1.cxx

...AOD/xAODCaloEvent/xAODCaloEvent/CaloVertexedClusterBase.h

Event/xAOD/xAODCaloEvent/xAODCaloEvent/selection.xml

...AOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h

.../xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloTower_v1.h

Event/xAOD/xAODEgamma/CMakeLists.txt

Event/xAOD/xAODEgamma/Root/Egamma_v1.cxx

Event/xAOD/xAODEgamma/xAODEgamma/selection.xml

Event/xAOD/xAODEgamma/xAODEgamma/versions/Egamma_v1.h

Event/xAOD/xAODJet/Root/Jet_v1.cxx