Always complete the toolbox teardown path, even in the face of failures along the way (bug 1063926). r=paul

--HG--
extra : rebase_source : 514ace11185493879c560dad7a7fb7ad0fa48e91