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