No leftover dirs during upgrade
Merge pull request #2992 from lutovich/2.1-clean-tmp-upgrade-dirs

No leftover dirs during upgrade