remove \r from hostname in cmd_drain.run test on Windows.
===VersionHistory:None===
Merge branch 'V8_1_3-branch'