Bug 932318 - [Messages] jshint fixes from bug 901852 and bug 927783 r=rwaldron

Fix also a unit test issue.
Merge pull request #13184 from julienw/932318-fix-jshint

Bug 932318 - [Messages] jshint fixes from bug 901852 and bug 927783 r=rw...