[GAIA BUG935636] - lint fixes
Merge pull request #297 from michalbe/Bug935636-temp

[GAIA BUG935636] - lint fixes