Daily merge of 22.0 into master, Nov 2nd
Use master-version for conflicts encountered in version.txt and References.py files, manually resolve a conflict in Trigger/TrigT1/TrigT1CaloCalibTools/CMakeLists.txt
Use master-version for conflicts encountered in version.txt and References.py files, manually resolve a conflict in Trigger/TrigT1/TrigT1CaloCalibTools/CMakeLists.txt