Merge branch 'fwinkl_20201029T141653' into 'master'

Event/xAOD/xAODEgammaCnv/CMakeLists.txt

Event/xAOD/xAODEgammaCnv/python/xAODEgammaCnvFactories.py

Event/xAOD/xAODForwardCnv/CMakeLists.txt

...xAOD/xAODForwardCnv/python/xAODForwardEventInfoCreator.py

Event/xAOD/xAODForwardCnv/python/xAODMBTSModuleCreator.py

Event/xAOD/xAODTauCnv/CMakeLists.txt

Event/xAOD/xAODTauCnv/python/xAODTauConverter.py

Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt

...xAOD/xAODTrigCaloCnv/python/xAODTrigCaloClusterCreator.py

...t/xAOD/xAODTrigCaloCnv/python/xAODTrigEMClusterCreator.py

Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt

Event/xAOD/xAODTrigL1CaloCnv/python/xAODTrigL1CaloCreator.py

Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt

...t/xAOD/xAODTrigMinBiasCnv/python/xAODTrigHist2DCreator.py

...DTrigMinBiasCnv/python/xAODTrigSpacePointCountsCreator.py

...OD/xAODTrigMinBiasCnv/python/xAODTrigT2MbtsBitsCreator.py

...D/xAODTrigMinBiasCnv/python/xAODTrigTrackCountsCreator.py

.../xAODTrigMinBiasCnv/python/xAODTrigVertexCountsCreator.py

Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt

...D/xAODTrigMissingETCnv/python/xAODTrigMissingETCreator.py