Bug 979983 - Fix gjslint issues on v1.3