Merge branch 'Release22_1'
# Conflicts:
# Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj
# Core/Common/src/Core.Common.Version/GlobalAssembly.cs.template
# Core/Common/test/Core.Common.Util.Test/Reflection/AssemblyUtilsTest.cs
# build/Base.targets