Pull updates for path module from upstream node.
Merge pull request #1080 from Gozala/hotfix/path

Bug 746124 - Pull updates for path module from upstream node.