Labs: further fixes to toollabs and gridengine

This reverts commit d67485f8d4cebe0cab1d9e2f6f585bed6e507e30.

Change-Id: I64627e202900b4d7bbf0334bf64261c9f86d73e7