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

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