Bug 1010088 - Use STAGE_DIR consistently on build process
Merge pull request #19229 from mcjimenez/bug1010088

Bug 1010088 - Use STAGE_DIR consistently on build process