Bug 850039 - Fix the linter again.
Merge pull request #8625 from KevinGrandon/bug_850039_fix_more_lint_errors

Bug 850039 - Fix the linter again r=me