[GAIA BUG886754] - Lint fixes
Merge pull request #270 from michalbe/Bug886754-temp

[GAIA BUG886754] - Lint fixes