[GAIA BUG997599] - Lint fixes
Merge pull request #309 from michalbe/Bug997599-temp

[GAIA BUG997599] - Lint fixes