Bug 850039 - Fix lint errors.
Merge pull request #8586 from KevinGrandon/fix_lint_errors

Bug 850039 - Fix lint errors.