Merge pull request #7627 from hydra/bf-fix-test-cygwin-issue