Merge pull request #3433 from jow-/python-use-staging-dir-hostpkg