[TIMOB-16386] More fixes to the Windows Hybrid environment detection.
Merge pull request #5407 from cb1kenobi/timob-16386_3_2_X_hybrid

[TIMOB-16386] More fixes to the Windows Hybrid environment detection.