Conflicts:
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusV0Cascade.cxx
	Projects/AthDataQuality/version.txt
	Projects/AthSimulation/version.txt
	Projects/Athena/version.txt
	Projects/DetCommon/version.txt
	Projects/VP1Light/version.txt
	Reconstruction/RecJobTransforms/python/RecoConfigFlags.py
	Reconstruction/VKalVrt/VrtSecInclusive/python/VrtSecInclusiveConfig.py
	Tools/WorkflowTestRunner/python/References.py