[GAIA BUG1018819] - lint fixes
Merge pull request #323 from michalbe/Bug1018819-temp

[GAIA BUG1018819] - lint fixes