Bug 987838 - Fix lint errors due to disabling of intermittent test