[MERGE] Restore environment variables in a timely fashion (bug 124153)

[John Arbash Meinel]

John Arbash Meinel has voted +0.
Status is now: Waiting
Comment:
I pretty much agree with Andrew that this is fixing the symptom rather 
than the bug. AFAIK, the test suite does restore the HOME variable, just 
after _finishLogFile (because of the LIFO structure of addCleanup()). So 
this works only because it is being set after the log file work (so I 
think it means we clean up HOME 2 times instead of just one, but I'm not 
positive).

I'm willing to have this merged as a band-aid, though.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Cd06a5cd30707082229w464d0aecjc5601364a98cba%40mail.gmail.com%3E