[GAIA] - lint fixes
Merge pull request #441 from michalbe/Bug1042584-ICE-2-temp

[GAIA] - lint fixes