Labs: Further tweaks to class gridengine

Change-Id: Iceb18614313a3170871c2608107d304fc8d0b064