Bug 516346 and changes to support spaces in install path
5 files changed