Bug 979983 - Fix gjslint issues on v1.3
Merge pull request #16914 from julienw/979983-v1.3-fix-gjslint-issues

Bug 979983 - Fix gjslint issues on v1.3