Labs: more fixes to gridengine puppetization

Change-Id: I7268858ca266f747a2e53155178b7247faf538e9