Cb-7904: Pull request for nightlys

why not just use process.cwd()?