Add -W option to --rand-thin-dir making it easier

Also make the rand-thin-dir wipe up after itself
Merge pull request #16730 from thatch45/wipe_on_rand

Add -W option to --rand-thin-dir making it easier