TRUNK-3944: Responded to more review comments
TRUNK-4002 Test in WebModuleUtilTest fails on Windows