Bug 935114 - Node 'os'
Merge pull request #1337 from jsantell/node-os

Fixes Bug 935114 - Node 'os', r=@erikvold
Tweak some comments per bug 910523 and bug 910517.

Taken from https://hg.mozilla.org/integration/fx-team/rev/c15febfd8b29
Hotfix less strict node-os test for os.arch()