[GAIA] - Final lint fixes
Merge pull request #262 from michalbe/b6527-nfc-temp

[GAIA] - Final lint fixes