[GAIA BUG997599] - linter fixes
Merge pull request #352 from michalbe/Bug997599-temp

Lint fixes