Fix gjslint problems prior to merging to Gaia