Add property to pick up tmpdir environment variable
Merge branch 'master' of github.com:StratusLab/marketplace