[bug 1082656] Fix linting errors.
Merge pull request #849 from akatsoulas/1082656

[bug 1082656] Fix linting errors.