3.1: backport fixes 2024-09-26 #4819

Job	Run time
pr-windows-build / Determine build info	6s
pr-windows-build / call-build-windows-package (Windows 32bit, x86, C:\vcpkg\packages\openssl_x86-windows-static, x86...	22m 0s
pr-windows-build / call-build-windows-package (Windows 64bit, x64, C:\vcpkg\packages\openssl_x64-windows-static, x64...	19m 34s
pr-windows-build / call-build-windows-package (Windows 64bit (Arm64), amd64_arm64, C:\vcpkg\packages\openssl_arm64-w...	20m 4s
pr-windows-build / Handle upload to S3	10s
run-windows-unit-tests / call-build-windows-unit-test (Windows 32bit, x86, C:\vcpkg\packages\openssl_x86-windows-static, x...	22m 5s
run-windows-unit-tests / call-build-windows-unit-test (Windows 64bit, x64, C:\vcpkg\packages\openssl_x64-windows-static, x...	20m 10s
	1h 44m 9s

Provide feedback