Merge remote-tracking branch 'upstream/master'

Calorimeter/CaloDigiAlgs/CMakeLists.txt

Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h

...eter/CaloDigiAlgs/src/components/CaloDigiAlgs_entries.cxx

Control/CalypsoExample/BarcodeChecker/CMakeLists.txt

...CalypsoExample/BarcodeChecker/python/BarcodeCheckerAlg.py

Control/CalypsoExample/BarcodeChecker/python/__init__.py

...Example/BarcodeChecker/share/BarcodeChecker_jobOptions.py

Control/CalypsoExample/Digitization/CMakeLists.txt

Control/CalypsoExample/Digitization/scripts/faser_digi.py

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

Control/CalypsoExample/TruthEventDumper/CMakeLists.txt

...psoExample/TruthEventDumper/python/TruthEventDumperAlg.py

Control/CalypsoExample/TruthEventDumper/python/__init__.py

...ple/TruthEventDumper/share/TruthEventDumper_jobOptions.py

...ample/WaveformDataAccessExample/src/RawWaveformAccess.cxx

...Example/WaveformDataAccessExample/src/RawWaveformAccess.h

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser01.py

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser02.py