Merge remote-tracking branch 'upstream/master'

Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx

Calorimeter/CaloRecTools/python/CaloRecToolConfig.py

Control/CalypsoExample/Digitization/CMakeLists.txt

Control/CalypsoExample/Digitization/scripts/faser_digi.py

...l/CalypsoExample/Digitization/scripts/faser_digi_merge.py

.../CalypsoExample/Digitization/scripts/submit_faser_digi.sh

...soExample/Digitization/scripts/submit_faser_digi_merge.sh

Control/CalypsoExample/Generation/python/faser_parser.py

...psoExample/Generation/scripts/submit_faser_particlegun.sh

Control/CalypsoExample/NeutrinoHits/CMakeLists.txt

Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py

...alypsoExample/NeutrinoHits/scripts/submit_faser_dumpnu.sh

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

...alypsoExample/Reconstruction/scripts/submit_faser_reco.sh

Control/CalypsoExample/Simulation/scripts/faser_simulate.py

...alypsoExample/Simulation/scripts/submit_faser_simulate.sh