fix PathMacroManagerTest; fix typo in EP name
IDEA-108318 "Method call is ambiguous" when using groovy builders
fixed PY-9920 Path variable is automatically expanded and saved if used inside script parameters

replace all occurrences of macro as it done in ExpandMacroToPathMap.substitute to have consistent behaviour
Merge remote-tracking branch 'origin/master'