Fix tmp dir never cleanup
Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup

Fix tmp dir never cleanup