Merge pull request #7846 from hydra/bf-fix-tests-cygwin