[GAIA BUG984584] - Lint fixes
Merge pull request #289 from michalbe/Bug984584-temp

[GAIA BUG984584] - Lint fixes