[GAIA BUG935636] - lint fixes