Adjust some timeouts so tests pass on windows
Merge pull request #2761 from raytiley/win-timeout-issues

Adjust some timeouts so tests pass on windows