[GAIA BUG1018819] - lint fixes