Fix Bug 936498 - Fix lint errors present on master