Merge pull request #3452 from ntherning/fix-AppDomainSetupTest-on-windows