Merge pull request #20543 from julienw/1016504-call-teardown-on-mocks

Bug 1016504 - Intermittent system/test/unit/bootstrap_test.js | system/B...
(cherry picked from commit 336c30b6147cdd9122ad0b2bbffb81eb869a9ec2)