[Backport 2.x] Bug Fixes for minor issues with SQL PIT refactor #2033

Job	Run time
security-it-windows-macos (windows-latest, 11)	3m 54s
security-it-windows-macos (windows-latest, 17)	4m 8s
security-it-windows-macos (windows-latest, 21)	3m 57s
security-it-windows-macos (macos-13, 11)	5m 57s
security-it-windows-macos (macos-13, 17)	5m 19s
security-it-windows-macos (macos-13, 21)	3m 52s
Get-CI-Image-Tag / Get-CI-Image-Tag	5s
security-it-linux (11)	4m 6s
security-it-linux (17)	4m 32s
security-it-linux (21)	4m 33s
	40m 23s

Provide feedback