Fix Windows longpath tests on one problematic Win7 computer

The changes are only cosmetic, and the root reason for the test failures
is still unclear, since the same tests pass on other Windows 7 machines
and on onther Windows machines.
Merge commit 'fbb132d3ce3920244f9fe2d8a060ec218f04d8fc' into HEAD