Bug 868363 - Fixing lint errors
Merge pull request #9732 from lodr/bug-868363-fixing-lint

Bug 868363 - Fixing lint errors
r=:arcturus