Fix rest tests failures on Windows platform
Merge pull request #1243 from gaohoward/2.3.x-rest

Fix rest tests failures on Windows platform