[GAIA BUG886754] - Lint fixes