Bug872597 - Fix linting errors present on master branch