Labs: further fixes to gridengine puppetization

Change-Id: Ic1a09db355214f5d62898f67fb35064afb2bc74d