Labs: more tweaks to gridengine puppetization

Change-Id: I919a9289653e60df6714a20fe7bbce9003341df6
Merge "Labs: more tweaks to gridengine puppetization" into production