Merge pull request #2757 from akoeplinger/fix-coreclr-test