Conflicts:
Projects/AthDataQuality/version.txt
Projects/AthSimulation/version.txt
Projects/Athena/version.txt
Projects/DetCommon/version.txt
Projects/VP1Light/version.txt
Tools/WorkflowTestRunner/python/References.py
Tracking/TrkEventCnv/TrkEventCnvTools/python/TrkEventCnvToolsConfigCA.py
Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerToolRun3.h