Bug 1016429 - [Settings] Fix unit tests with a newer mocha r=cctuan
Merge pull request #20675 from julienw/1016429-fix-settings-test-newer-mocha

Bug 1016429 - [Settings] Fix unit tests with a newer mocha r=cctuan