Bug 1054542 - Fix lint issues