fix for windows installer sometimes wrongly putting $$() in config files #3509
===VersionHistory:Pending===
Merge branch 'V8_2_2-branch' into V8_3_0-branch
Merge branch 'V8_3_0-branch'