Fix issue with moving xplat installation directory
Merge pull request #1315 from andrerod/dev

Fix issue with moving xplat installation directory