Fix a couple random test failures.
Review Request #7950 — Created Feb. 7, 2016 and submitted — Latest diff uploaded
These have been broken for a while due to an issue during cleanup with the temp
directory not being empty. This change switches fromrmdirtormtree.
Ran unit tests.